Make CassandraBlobStore.toString() return host:port, use it in a few places

for logging and exception strings.

Author: Tom May

plugins/cassandra/src/main/java/org/elasticsearch/cassandra/blobstore/AbstractCassandraBlobContainer.java

@@ -43,7 +43,8 @@ public AbstractCassandraBlobContainer(BlobPath path, CassandraBlobStore blobStor
         super(path);
         this.blobPath = path.buildAsString("/");
         this.blobStore = blobStore;
-        logger.debug("AbstractCassandraBlobContainer path={}", path);
+        logger.debug("AbstractCassandraBlobContainer blobStore={} path={}",
+            blobStore, path);
     }
 
     @Override public boolean blobExists(String blobName) {

plugins/cassandra/src/main/java/org/elasticsearch/cassandra/blobstore/CassandraBlobStore.java

@@ -115,6 +115,8 @@ public class CassandraBlobStore extends AbstractComponent implements BlobStore {
 
     private final String keyspace;
 
+    private final String hostAndPort;
+
     private final CassandraClientFactory cassandraClientFactory;
 
     private final Executor executor;
@@ -129,18 +131,19 @@ public CassandraBlobStore(Settings settings, Executor executor) {
 
         String host = settings.get("host", "localhost");
         int port = settings.getAsInt("port", 9160);
+        hostAndPort = host + ':' + port;
         cassandraClientFactory = new CassandraClientFactory(host, port);
 
         this.executor = executor;
 
         this.bufferSizeInBytes = (int) settings.getAsBytesSize("buffer_size", new ByteSizeValue(100, ByteSizeUnit.KB)).bytes();
 
-        logger.debug("CassandraBlobStore {}:{} executor: {} bufferSizeInBytes: {}",
-            host, port, executor, bufferSizeInBytes);
+        logger.debug("CassandraBlobStore {} executor: {} bufferSizeInBytes: {}",
+            this, executor, bufferSizeInBytes);
     }
 
     @Override public String toString() {
-        return "cassandra"; // XXX
+        return hostAndPort;
     }
 
     /* XXX
@@ -165,7 +168,7 @@ public int bufferSizeInBytes() {
         }
         catch (IOException ex) {
             // Oh well, nothing we can do but log.
-            logger.warn("delete {} failed", ex, blobPath);
+            logger.warn("delete {} failed on {}", ex, blobPath, this);
         }
     }
 
@@ -314,16 +317,16 @@ ImmutableMap<String, BlobMetaData> listBlobsByPrefix(String blobPath, @Nullable
                 ConsistencyLevel.QUORUM);
         }
         catch (InvalidRequestException ex) {
-            throw new IOException("Cassandra get_slice on ???:??? failed", ex);
+            throw new IOException("Cassandra get_slice failed on " + this, ex);
         }
         catch (UnavailableException ex) {
-            throw new IOException("Cassandra get_slice on ???:??? failed", ex);
+            throw new IOException("Cassandra get_slice failed on " + this, ex);
         }
         catch (TimedOutException ex) {
-            throw new IOException("Cassandra get_slice on ???:??? failed", ex);
+            throw new IOException("Cassandra get_slice failed on " + this, ex);
         }
         catch (TException ex) {
-            throw new IOException("Cassandra get_slice on ???:??? failed", ex);
+            throw new IOException("Cassandra get_slice failed on " + this, ex);
         }
         finally {
             cassandraClientFactory.closeCassandraClient(client);

plugins/cassandra/src/main/java/org/elasticsearch/cassandra/blobstore/CassandraImmutableBlobContainer.java

@@ -33,6 +33,8 @@ public class CassandraImmutableBlobContainer extends AbstractCassandraBlobContai
 
     public CassandraImmutableBlobContainer(BlobPath path, CassandraBlobStore blobStore) {
         super(path, blobStore);
+        logger.debug("CassandraImmutableBlobContainer blobStore={} path={}",
+            blobStore, path);
     }
 
     @Override public void writeBlob(String blobName, InputStream is, long sizeInBytes, WriterListener listener) {