accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject git commit: ACCUMULO-3028 Remove/fix some logging from the replication code.
Date Tue, 29 Jul 2014 03:26:20 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 46ab1f616 -> cfb989878


ACCUMULO-3028 Remove/fix some logging from the replication code.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cfb98987
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cfb98987
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cfb98987

Branch: refs/heads/master
Commit: cfb989878d78fe429bfc31a9e59df8a0185a4396
Parents: 46ab1f6
Author: Josh Elser <elserj@apache.org>
Authored: Mon Jul 28 23:24:26 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Jul 28 23:24:26 2014 -0400

----------------------------------------------------------------------
 .../accumulo/core/client/impl/ReplicationClient.java |  6 +++---
 .../org/apache/accumulo/tserver/TabletServer.java    | 15 ---------------
 .../tserver/replication/AccumuloReplicaSystem.java   |  2 +-
 3 files changed, 4 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfb98987/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationClient.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationClient.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationClient.java
index 8f15839..7e9dc60 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ReplicationClient.java
@@ -103,7 +103,7 @@ public class ReplicationClient {
     // Throw the hostname and port through HostAndPort to get some normalization
     HostAndPort coordinatorAddr = HostAndPort.fromString(replCoordinatorAddr);
 
-    log.debug("Connecting to master at {}", coordinatorAddr.toString());
+    log.debug("Connecting to master at {}", coordinatorAddr);
 
     try {
       // Master requests can take a long time: don't ever time out
@@ -111,7 +111,7 @@ public class ReplicationClient {
           conf);
       return client;
     } catch (TTransportException tte) {
-      log.debug("Failed to connect to master coordinator service ({})", coordinatorAddr.toString(),
tte);
+      log.debug("Failed to connect to master coordinator service ({})", coordinatorAddr,
tte);
       return null;
     }
   }
@@ -132,7 +132,7 @@ public class ReplicationClient {
     try {
       return ThriftUtil.getClientNoTimeout(new ReplicationServicer.Client.Factory(), server,
ServerConfigurationUtil.getConfiguration(inst));
     } catch (TTransportException tte) {
-      log.debug("Failed to connect to servicer ({}), will retry...", tte);
+      log.debug("Failed to connect to servicer ({}), will retry...", server, tte);
       throw tte;
     }
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfb98987/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 9f354cd..1284de5 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -902,21 +902,6 @@ public class TabletServer implements Runnable {
         throw new NoSuchScanIDException();
       }
 
-      log.trace("Writing mutations in closeUpdate: ");
-      for (Entry<Tablet,List<Mutation>> entry : us.queuedMutations.entrySet())
{
-        log.trace(entry.getKey().getExtent() + " => ");
-        for (Mutation m : entry.getValue()) {
-          StringBuilder sb = new StringBuilder(64);
-          for (ColumnUpdate update : m.getUpdates()) {
-            if (sb.length()>0) {
-              sb.append(", ");
-            }
-            sb.append(new String(update.getColumnFamily()) + " " + new String(update.getColumnQualifier())
+  " " + new String(update.getValue()));
-          }
-          log.trace(new String(m.getRow()) + " [" + sb + "]");
-        }
-      }
-
       // clients may or may not see data from an update session while
       // it is in progress, however when the update session is closed
       // want to ensure that reads wait for the write to finish

http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfb98987/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
index 7fd2471..c95d136 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/replication/AccumuloReplicaSystem.java
@@ -568,7 +568,7 @@ public class AccumuloReplicaSystem implements ReplicaSystem {
           }
           break;
         default:
-          log.trace("Ignorning WAL entry which doesn't contain mutations");
+          log.trace("Ignorning WAL entry which doesn't contain mutations, should not have
received such entries");
           break;
       }
     }


Mime
View raw message