accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [1/2] accumulo git commit: ACCUMULO-3747 1.6 fix to 1.7
Date Tue, 23 Jun 2015 20:27:44 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master 121cc6bc0 -> d07451861


ACCUMULO-3747 1.6 fix to 1.7


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

Branch: refs/heads/master
Commit: 8dd229c8a918d0339680d8430fc6caf2808ffd6b
Parents: 7985b91
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Tue Jun 23 16:22:43 2015 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Tue Jun 23 16:22:43 2015 -0400

----------------------------------------------------------------------
 .../apache/accumulo/test/DetectDeadTabletServers.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8dd229c8/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServers.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServers.java b/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServers.java
index 15afd25..a3d548d 100644
--- a/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServers.java
+++ b/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServers.java
@@ -20,18 +20,19 @@ import static org.apache.accumulo.minicluster.ServerType.TABLET_SERVER;
 import static org.junit.Assert.assertEquals;
 
 import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.impl.ClientContext;
+import org.apache.accumulo.core.client.impl.Credentials;
 import org.apache.accumulo.core.client.impl.MasterClient;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.conf.Property;
-import org.apache.accumulo.core.master.thrift.MasterClientService;
+import org.apache.accumulo.core.master.thrift.MasterClientService.Client;
 import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
 import org.apache.accumulo.core.metadata.MetadataTable;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.Credentials;
+import org.apache.accumulo.core.trace.Tracer;
 import org.apache.accumulo.fate.util.UtilWaitThread;
 import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
 import org.apache.accumulo.test.functional.ConfigurableMacIT;
-import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.hadoop.conf.Configuration;
 import org.junit.Test;
 
@@ -80,11 +81,12 @@ public class DetectDeadTabletServers extends ConfigurableMacIT {
 
   private MasterMonitorInfo getStats(Connector c) throws Exception {
     Credentials creds = new Credentials("root", new PasswordToken(ROOT_PASSWORD));
-    MasterClientService.Iface client = null;
+    ClientContext context = new ClientContext(c.getInstance(), creds, getClientConfig());
+    Client client = null;
     try {
-      client = MasterClient.getConnectionWithRetry(c.getInstance());
+      client = MasterClient.getConnectionWithRetry(context);
       log.info("Fetching master stats");
-      return client.getMasterStats(Tracer.traceInfo(), creds.toThrift(c.getInstance()));
+      return client.getMasterStats(Tracer.traceInfo(), context.rpcCreds());
     } finally {
       if (client != null) {
         MasterClient.close(client);


Mime
View raw message