accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1359639 [1/13] - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/client/impl/ core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ core/src/main/...
Date Tue, 10 Jul 2012 12:39:55 GMT
Author: ecn
Date: Tue Jul 10 12:39:52 2012
New Revision: 1359639

URL: http://svn.apache.org/viewvc?rev=1359639&view=rev
Log:
ACCUMULO-672 commit to trunk

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TableOperation.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
    accumulo/trunk/core/src/main/thrift/thrift.sh
    accumulo/trunk/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
    accumulo/trunk/pom.xml
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/TServersServlet.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/SplitReportMessage.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/TabletStatusMessage.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/WrongTabletTest.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/functional/ZombieTServer.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/performance/thrift/NullTserver.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/Admin.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
    accumulo/trunk/src/   (props changed)
    accumulo/trunk/trace/pom.xml
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java
    accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java
    accumulo/trunk/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/TracerTest.java
    accumulo/trunk/trace/thrift.sh

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/ACCUMULO-672:r1357826,1357829,1357842,1357858,1358236
  Merged /accumulo/branches/1.4/src:r1358206
  Merged /accumulo/branches/1.4:r1358206

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Reverse-merged /incubator/accumulo/trunk/src/core:r1178656-1201898
  Merged /accumulo/branches/1.4/core:r1358206
  Merged /accumulo/branches/1.4/src/core:r1358206
  Merged /accumulo/branches/ACCUMULO-672/core:r1357826,1357829,1357842,1357858,1358236

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java?rev=1359639&r1=1359638&r2=1359639&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java Tue Jul 10 12:39:52 2012
@@ -21,6 +21,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.accumulo.cloudtrace.instrument.Tracer;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -35,7 +36,7 @@ import org.apache.accumulo.core.client.i
 import org.apache.accumulo.core.master.thrift.MasterClientService;
 import org.apache.accumulo.core.security.thrift.AuthInfo;
 import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
-import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface;
+import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
 import org.apache.accumulo.core.util.ArgumentChecker;
 import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -66,10 +67,10 @@ public class InstanceOperationsImpl impl
   @Override
   public void setProperty(final String property, final String value) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(property, value);
-    MasterClient.execute(instance, new ClientExec<MasterClientService.Iface>() {
+    MasterClient.execute(instance, new ClientExec<MasterClientService.Client>() {
       @Override
-      public void execute(MasterClientService.Iface client) throws Exception {
-        client.setSystemProperty(null, credentials, property, value);
+      public void execute(MasterClientService.Client client) throws Exception {
+        client.setSystemProperty(Tracer.traceInfo(), credentials, property, value);
       }
     });
   }
@@ -80,10 +81,10 @@ public class InstanceOperationsImpl impl
   @Override
   public void removeProperty(final String property) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(property);
-    MasterClient.execute(instance, new ClientExec<MasterClientService.Iface>() {
+    MasterClient.execute(instance, new ClientExec<MasterClientService.Client>() {
       @Override
-      public void execute(MasterClientService.Iface client) throws Exception {
-        client.removeSystemProperty(null, credentials, property);
+      public void execute(MasterClientService.Client client) throws Exception {
+        client.removeSystemProperty(Tracer.traceInfo(), credentials, property);
       }
     });
   }
@@ -93,9 +94,9 @@ public class InstanceOperationsImpl impl
    */
   @Override
   public Map<String,String> getSystemConfiguration() throws AccumuloException, AccumuloSecurityException {
-    return ServerClient.execute(instance, new ClientExecReturn<Map<String,String>,ClientService.Iface>() {
+    return ServerClient.execute(instance, new ClientExecReturn<Map<String,String>,ClientService.Client>() {
       @Override
-      public Map<String,String> execute(ClientService.Iface client) throws Exception {
+      public Map<String,String> execute(ClientService.Client client) throws Exception {
         return client.getConfiguration(ConfigurationType.CURRENT);
       }
     });
@@ -106,9 +107,9 @@ public class InstanceOperationsImpl impl
    */
   @Override
   public Map<String,String> getSiteConfiguration() throws AccumuloException, AccumuloSecurityException {
-    return ServerClient.execute(instance, new ClientExecReturn<Map<String,String>,ClientService.Iface>() {
+    return ServerClient.execute(instance, new ClientExecReturn<Map<String,String>,ClientService.Client>() {
       @Override
-      public Map<String,String> execute(ClientService.Iface client) throws Exception {
+      public Map<String,String> execute(ClientService.Client client) throws Exception {
         return client.getConfiguration(ConfigurationType.SITE);
       }
     });
@@ -144,10 +145,10 @@ public class InstanceOperationsImpl impl
   @Override
   public List<ActiveScan> getActiveScans(String tserver) throws AccumuloException, AccumuloSecurityException {
     List<org.apache.accumulo.core.tabletserver.thrift.ActiveScan> tas = ThriftUtil.execute(tserver, instance.getConfiguration(),
-        new ClientExecReturn<List<org.apache.accumulo.core.tabletserver.thrift.ActiveScan>,TabletClientService.Iface>() {
+        new ClientExecReturn<List<org.apache.accumulo.core.tabletserver.thrift.ActiveScan>,TabletClientService.Client>() {
           @Override
-          public List<org.apache.accumulo.core.tabletserver.thrift.ActiveScan> execute(Iface client) throws Exception {
-            return client.getActiveScans(null, credentials);
+          public List<org.apache.accumulo.core.tabletserver.thrift.ActiveScan> execute(TabletClientService.Client client) throws Exception {
+            return client.getActiveScans(Tracer.traceInfo(), credentials);
           }
         });
     List<ActiveScan> as = new ArrayList<ActiveScan>();
@@ -166,10 +167,10 @@ public class InstanceOperationsImpl impl
    */
   @Override
   public boolean testClassLoad(final String className, final String asTypeName) throws AccumuloException, AccumuloSecurityException {
-    return ServerClient.execute(instance, new ClientExecReturn<Boolean,ClientService.Iface>() {
+    return ServerClient.execute(instance, new ClientExecReturn<Boolean,ClientService.Client>() {
       @Override
-      public Boolean execute(ClientService.Iface client) throws Exception {
-        return client.checkClass(null, className, asTypeName);
+      public Boolean execute(ClientService.Client client) throws Exception {
+        return client.checkClass(Tracer.traceInfo(), className, asTypeName);
       }
     });
   }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java?rev=1359639&r1=1359638&r2=1359639&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java Tue Jul 10 12:39:52 2012
@@ -20,6 +20,7 @@ import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Set;
 
+import org.apache.accumulo.cloudtrace.instrument.Tracer;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Instance;
@@ -43,7 +44,7 @@ public class SecurityOperationsImpl impl
   private Instance instance;
   private AuthInfo credentials;
   
-  private void execute(ClientExec<ClientService.Iface> exec) throws AccumuloException, AccumuloSecurityException {
+  private void execute(ClientExec<ClientService.Client> exec) throws AccumuloException, AccumuloSecurityException {
     try {
       ServerClient.executeRaw(instance, exec);
     } catch (ThriftTableOperationException ttoe) {
@@ -61,7 +62,7 @@ public class SecurityOperationsImpl impl
     }
   }
   
-  private <T> T execute(ClientExecReturn<T,ClientService.Iface> exec) throws AccumuloException, AccumuloSecurityException {
+  private <T> T execute(ClientExecReturn<T,ClientService.Client> exec) throws AccumuloException, AccumuloSecurityException {
     try {
       return ServerClient.executeRaw(instance, exec);
     } catch (ThriftTableOperationException ttoe) {
@@ -107,10 +108,10 @@ public class SecurityOperationsImpl impl
    */
   public void createUser(final String user, final byte[] password, final Authorizations authorizations) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(user, password, authorizations);
-    execute(new ClientExec<ClientService.Iface>() {
+    execute(new ClientExec<ClientService.Client>() {
       @Override
-      public void execute(ClientService.Iface client) throws Exception {
-        client.createUser(null, credentials, user, ByteBuffer.wrap(password), ByteBufferUtil.toByteBuffers(authorizations.getAuthorizations()));
+      public void execute(ClientService.Client client) throws Exception {
+        client.createUser(Tracer.traceInfo(), credentials, user, ByteBuffer.wrap(password), ByteBufferUtil.toByteBuffers(authorizations.getAuthorizations()));
       }
     });
   }
@@ -127,10 +128,10 @@ public class SecurityOperationsImpl impl
    */
   public void dropUser(final String user) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(user);
-    execute(new ClientExec<ClientService.Iface>() {
+    execute(new ClientExec<ClientService.Client>() {
       @Override
-      public void execute(ClientService.Iface client) throws Exception {
-        client.dropUser(null, credentials, user);
+      public void execute(ClientService.Client client) throws Exception {
+        client.dropUser(Tracer.traceInfo(), credentials, user);
       }
     });
   }
@@ -150,10 +151,10 @@ public class SecurityOperationsImpl impl
    */
   public boolean authenticateUser(final String user, final byte[] password) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(user, password);
-    return execute(new ClientExecReturn<Boolean,ClientService.Iface>() {
+    return execute(new ClientExecReturn<Boolean,ClientService.Client>() {
       @Override
-      public Boolean execute(ClientService.Iface client) throws Exception {
-        return client.authenticateUser(null, credentials, user, ByteBuffer.wrap(password));
+      public Boolean execute(ClientService.Client client) throws Exception {
+        return client.authenticateUser(Tracer.traceInfo(), credentials, user, ByteBuffer.wrap(password));
       }
     });
   }
@@ -172,10 +173,10 @@ public class SecurityOperationsImpl impl
    */
   public void changeUserPassword(final String user, final byte[] password) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(user, password);
-    execute(new ClientExec<ClientService.Iface>() {
+    execute(new ClientExec<ClientService.Client>() {
       @Override
-      public void execute(ClientService.Iface client) throws Exception {
-        client.changePassword(null, credentials, user, ByteBuffer.wrap(password));
+      public void execute(ClientService.Client client) throws Exception {
+        client.changePassword(Tracer.traceInfo(), credentials, user, ByteBuffer.wrap(password));
       }
     });
     if (this.credentials.user.equals(user)) {
@@ -197,10 +198,10 @@ public class SecurityOperationsImpl impl
    */
   public void changeUserAuthorizations(final String user, final Authorizations authorizations) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(user, authorizations);
-    execute(new ClientExec<ClientService.Iface>() {
+    execute(new ClientExec<ClientService.Client>() {
       @Override
-      public void execute(ClientService.Iface client) throws Exception {
-        client.changeAuthorizations(null, credentials, user, ByteBufferUtil.toByteBuffers(authorizations.getAuthorizations()));
+      public void execute(ClientService.Client client) throws Exception {
+        client.changeAuthorizations(Tracer.traceInfo(), credentials, user, ByteBufferUtil.toByteBuffers(authorizations.getAuthorizations()));
       }
     });
   }
@@ -218,10 +219,10 @@ public class SecurityOperationsImpl impl
    */
   public Authorizations getUserAuthorizations(final String user) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(user);
-    return execute(new ClientExecReturn<Authorizations,ClientService.Iface>() {
+    return execute(new ClientExecReturn<Authorizations,ClientService.Client>() {
       @Override
-      public Authorizations execute(ClientService.Iface client) throws Exception {
-        return new Authorizations(client.getUserAuthorizations(null, credentials, user));
+      public Authorizations execute(ClientService.Client client) throws Exception {
+        return new Authorizations(client.getUserAuthorizations(Tracer.traceInfo(), credentials, user));
       }
     });
   }
@@ -241,10 +242,10 @@ public class SecurityOperationsImpl impl
    */
   public boolean hasSystemPermission(final String user, final SystemPermission perm) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(user, perm);
-    return execute(new ClientExecReturn<Boolean,ClientService.Iface>() {
+    return execute(new ClientExecReturn<Boolean,ClientService.Client>() {
       @Override
-      public Boolean execute(ClientService.Iface client) throws Exception {
-        return client.hasSystemPermission(null, credentials, user, perm.getId());
+      public Boolean execute(ClientService.Client client) throws Exception {
+        return client.hasSystemPermission(Tracer.traceInfo(), credentials, user, perm.getId());
       }
     });
   }
@@ -266,10 +267,10 @@ public class SecurityOperationsImpl impl
    */
   public boolean hasTablePermission(final String user, final String table, final TablePermission perm) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(user, table, perm);
-    return execute(new ClientExecReturn<Boolean,ClientService.Iface>() {
+    return execute(new ClientExecReturn<Boolean,ClientService.Client>() {
       @Override
-      public Boolean execute(ClientService.Iface client) throws Exception {
-        return client.hasTablePermission(null, credentials, user, table, perm.getId());
+      public Boolean execute(ClientService.Client client) throws Exception {
+        return client.hasTablePermission(Tracer.traceInfo(), credentials, user, table, perm.getId());
       }
     });
   }
@@ -288,10 +289,10 @@ public class SecurityOperationsImpl impl
    */
   public void grantSystemPermission(final String user, final SystemPermission permission) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(user, permission);
-    execute(new ClientExec<ClientService.Iface>() {
+    execute(new ClientExec<ClientService.Client>() {
       @Override
-      public void execute(ClientService.Iface client) throws Exception {
-        client.grantSystemPermission(null, credentials, user, permission.getId());
+      public void execute(ClientService.Client client) throws Exception {
+        client.grantSystemPermission(Tracer.traceInfo(), credentials, user, permission.getId());
       }
     });
   }
@@ -312,10 +313,10 @@ public class SecurityOperationsImpl impl
    */
   public void grantTablePermission(final String user, final String table, final TablePermission permission) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(user, table, permission);
-    execute(new ClientExec<ClientService.Iface>() {
+    execute(new ClientExec<ClientService.Client>() {
       @Override
-      public void execute(ClientService.Iface client) throws Exception {
-        client.grantTablePermission(null, credentials, user, table, permission.getId());
+      public void execute(ClientService.Client client) throws Exception {
+        client.grantTablePermission(Tracer.traceInfo(), credentials, user, table, permission.getId());
       }
     });
   }
@@ -334,10 +335,10 @@ public class SecurityOperationsImpl impl
    */
   public void revokeSystemPermission(final String user, final SystemPermission permission) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(user, permission);
-    execute(new ClientExec<ClientService.Iface>() {
+    execute(new ClientExec<ClientService.Client>() {
       @Override
-      public void execute(ClientService.Iface client) throws Exception {
-        client.revokeSystemPermission(null, credentials, user, permission.getId());
+      public void execute(ClientService.Client client) throws Exception {
+        client.revokeSystemPermission(Tracer.traceInfo(), credentials, user, permission.getId());
       }
     });
   }
@@ -359,10 +360,10 @@ public class SecurityOperationsImpl impl
   public void revokeTablePermission(final String user, final String table, final TablePermission permission) throws AccumuloException,
       AccumuloSecurityException {
     ArgumentChecker.notNull(user, table, permission);
-    execute(new ClientExec<ClientService.Iface>() {
+    execute(new ClientExec<ClientService.Client>() {
       @Override
-      public void execute(ClientService.Iface client) throws Exception {
-        client.revokeTablePermission(null, credentials, user, table, permission.getId());
+      public void execute(ClientService.Client client) throws Exception {
+        client.revokeTablePermission(Tracer.traceInfo(), credentials, user, table, permission.getId());
       }
     });
   }
@@ -377,10 +378,10 @@ public class SecurityOperationsImpl impl
    *           if the user does not have permission to query users
    */
   public Set<String> listUsers() throws AccumuloException, AccumuloSecurityException {
-    return execute(new ClientExecReturn<Set<String>,ClientService.Iface>() {
+    return execute(new ClientExecReturn<Set<String>,ClientService.Client>() {
       @Override
-      public Set<String> execute(ClientService.Iface client) throws Exception {
-        return client.listUsers(null, credentials);
+      public Set<String> execute(ClientService.Client client) throws Exception {
+        return client.listUsers(Tracer.traceInfo(), credentials);
       }
     });
   }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java?rev=1359639&r1=1359638&r2=1359639&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java Tue Jul 10 12:39:52 2012
@@ -38,6 +38,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.apache.accumulo.cloudtrace.instrument.Tracer;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -91,7 +92,6 @@ import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TApplicationException;
 import org.apache.thrift.TException;
-import org.apache.thrift.TServiceClient;
 import org.apache.thrift.transport.TTransportException;
 
 /**
@@ -204,7 +204,7 @@ public class TableOperationsImpl extends
       MasterClientService.Iface client = null;
       try {
         client = MasterClient.getConnectionWithRetry(instance);
-        return client.beginTableOperation(null, credentials);
+        return client.beginTableOperation(Tracer.traceInfo(), credentials);
       } catch (TTransportException tte) {
         log.debug("Failed to call beginTableOperation(), retrying ... ", tte);
         UtilWaitThread.sleep(100);
@@ -220,7 +220,7 @@ public class TableOperationsImpl extends
       MasterClientService.Iface client = null;
       try {
         client = MasterClient.getConnectionWithRetry(instance);
-        client.executeTableOperation(null, credentials, opid, op, args, opts, autoCleanUp);
+        client.executeTableOperation(Tracer.traceInfo(), credentials, opid, op, args, opts, autoCleanUp);
         break;
       } catch (TTransportException tte) {
         log.debug("Failed to call executeTableOperation(), retrying ... ", tte);
@@ -236,7 +236,7 @@ public class TableOperationsImpl extends
       MasterClientService.Iface client = null;
       try {
         client = MasterClient.getConnectionWithRetry(instance);
-        return client.waitForTableOperation(null, credentials, opid);
+        return client.waitForTableOperation(Tracer.traceInfo(), credentials, opid);
       } catch (TTransportException tte) {
         log.debug("Failed to call waitForTableOperation(), retrying ... ", tte);
         UtilWaitThread.sleep(100);
@@ -251,7 +251,7 @@ public class TableOperationsImpl extends
       MasterClientService.Iface client = null;
       try {
         client = MasterClient.getConnectionWithRetry(instance);
-        client.finishTableOperation(null, credentials, opid);
+        client.finishTableOperation(Tracer.traceInfo(), credentials, opid);
         break;
       } catch (TTransportException tte) {
         log.debug("Failed to call finishTableOperation(), retrying ... ", tte);
@@ -440,13 +440,13 @@ public class TableOperationsImpl extends
         }
         
         try {
-          TabletClientService.Iface client = ThriftUtil.getTServerClient(tl.tablet_location, instance.getConfiguration());
+          TabletClientService.Client client = ThriftUtil.getTServerClient(tl.tablet_location, instance.getConfiguration());
           try {
             OpTimer opTimer = null;
             if (log.isTraceEnabled())
               opTimer = new OpTimer(log, Level.TRACE).start("Splitting tablet " + tl.tablet_extent + " on " + tl.tablet_location + " at " + split);
             
-            client.splitTablet(null, credentials, tl.tablet_extent.toThrift(), TextUtil.getByteBuffer(split));
+            client.splitTablet(Tracer.traceInfo(), credentials, tl.tablet_extent.toThrift(), TextUtil.getByteBuffer(split));
             
             // just split it, might as well invalidate it in the cache
             tabLocator.invalidateCache(tl.tablet_extent);
@@ -454,7 +454,7 @@ public class TableOperationsImpl extends
             if (opTimer != null)
               opTimer.stop("Split tablet in %DURATION%");
           } finally {
-            ThriftUtil.returnClient((TServiceClient) client);
+            ThriftUtil.returnClient(client);
           }
           
         } catch (TApplicationException tae) {
@@ -723,7 +723,7 @@ public class TableOperationsImpl extends
         MasterClientService.Iface client = null;
         try {
           client = MasterClient.getConnectionWithRetry(instance);
-          flushID = client.initiateFlush(null, credentials, tableId);
+          flushID = client.initiateFlush(Tracer.traceInfo(), credentials, tableId);
           break;
         } catch (TTransportException tte) {
           log.debug("Failed to call initiateFlush, retrying ... ", tte);
@@ -737,7 +737,7 @@ public class TableOperationsImpl extends
         MasterClientService.Iface client = null;
         try {
           client = MasterClient.getConnectionWithRetry(instance);
-          client.waitForFlush(null, credentials, tableId, TextUtil.getByteBuffer(start), TextUtil.getByteBuffer(end), flushID, wait ? Long.MAX_VALUE : 1);
+          client.waitForFlush(Tracer.traceInfo(), credentials, tableId, TextUtil.getByteBuffer(start), TextUtil.getByteBuffer(end), flushID, wait ? Long.MAX_VALUE : 1);
           break;
         } catch (TTransportException tte) {
           log.debug("Failed to call initiateFlush, retrying ... ", tte);
@@ -778,10 +778,10 @@ public class TableOperationsImpl extends
    */
   public void setProperty(final String tableName, final String property, final String value) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(tableName, property, value);
-    MasterClient.execute(instance, new ClientExec<MasterClientService.Iface>() {
+    MasterClient.execute(instance, new ClientExec<MasterClientService.Client>() {
       @Override
-      public void execute(MasterClientService.Iface client) throws Exception {
-        client.setTableProperty(null, credentials, tableName, property, value);
+      public void execute(MasterClientService.Client client) throws Exception {
+        client.setTableProperty(Tracer.traceInfo(), credentials, tableName, property, value);
       }
     });
   }
@@ -800,10 +800,10 @@ public class TableOperationsImpl extends
    */
   public void removeProperty(final String tableName, final String property) throws AccumuloException, AccumuloSecurityException {
     ArgumentChecker.notNull(tableName, property);
-    MasterClient.execute(instance, new ClientExec<MasterClientService.Iface>() {
+    MasterClient.execute(instance, new ClientExec<MasterClientService.Client>() {
       @Override
-      public void execute(MasterClientService.Iface client) throws Exception {
-        client.removeTableProperty(null, credentials, tableName, property);
+      public void execute(MasterClientService.Client client) throws Exception {
+        client.removeTableProperty(Tracer.traceInfo(), credentials, tableName, property);
       }
     });
   }
@@ -820,9 +820,9 @@ public class TableOperationsImpl extends
   public Iterable<Entry<String,String>> getProperties(final String tableName) throws AccumuloException, TableNotFoundException {
     ArgumentChecker.notNull(tableName);
     try {
-      return ServerClient.executeRaw(instance, new ClientExecReturn<Map<String,String>,ClientService.Iface>() {
+      return ServerClient.executeRaw(instance, new ClientExecReturn<Map<String,String>,ClientService.Client>() {
         @Override
-        public Map<String,String> execute(ClientService.Iface client) throws Exception {
+        public Map<String,String> execute(ClientService.Client client) throws Exception {
           return client.getTableConfiguration(tableName);
         }
       }).entrySet();

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java?rev=1359639&r1=1359638&r2=1359639&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java Tue Jul 10 12:39:52 2012
@@ -18,6 +18,7 @@ package org.apache.accumulo.core.client.
 
 import java.nio.ByteBuffer;
 
+import org.apache.accumulo.cloudtrace.instrument.Tracer;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.BatchDeleter;
@@ -72,10 +73,10 @@ public class ConnectorImpl extends Conne
     // hardcoded string for SYSTEM user since the definition is
     // in server code
     if (!user.equals("!SYSTEM")) {
-      ServerClient.execute(instance, new ClientExec<ClientService.Iface>() {
+      ServerClient.execute(instance, new ClientExec<ClientService.Client>() {
         @Override
-        public void execute(ClientService.Iface iface) throws Exception {
-          iface.authenticateUser(null, credentials, credentials.user, credentials.password);
+        public void execute(ClientService.Client iface) throws Exception {
+          iface.authenticateUser(Tracer.traceInfo(), credentials, credentials.user, credentials.password);
         }
       });
     }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java?rev=1359639&r1=1359638&r2=1359639&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java Tue Jul 10 12:39:52 2012
@@ -35,12 +35,12 @@ import org.apache.thrift.transport.TTran
 public class MasterClient {
   private static final Logger log = Logger.getLogger(MasterClient.class);
   
-  public static MasterClientService.Iface getConnectionWithRetry(Instance instance) {
+  public static MasterClientService.Client getConnectionWithRetry(Instance instance) {
     ArgumentChecker.notNull(instance);
     
     while (true) {
       
-      MasterClientService.Iface result = getConnection(instance);
+      MasterClientService.Client result = getConnection(instance);
       if (result != null)
         return result;
       UtilWaitThread.sleep(250);
@@ -48,7 +48,7 @@ public class MasterClient {
     
   }
   
-  public static MasterClientService.Iface getConnection(Instance instance) {
+  public static MasterClientService.Client getConnection(Instance instance) {
     List<String> locations = instance.getMasterLocations();
     
     if (locations.size() == 0) {
@@ -61,7 +61,7 @@ public class MasterClient {
     
     try {
       // Master requests can take a long time: don't ever time out
-      MasterClientService.Iface client = ThriftUtil.getClient(new MasterClientService.Client.Factory(), master, Property.MASTER_CLIENTPORT,
+      MasterClientService.Client client = ThriftUtil.getClient(new MasterClientService.Client.Factory(), master, Property.MASTER_CLIENTPORT,
           instance.getConfiguration());
       return client;
     } catch (TTransportException tte) {
@@ -83,8 +83,8 @@ public class MasterClient {
     }
   }
   
-  public static <T> T execute(Instance instance, ClientExecReturn<T,MasterClientService.Iface> exec) throws AccumuloException, AccumuloSecurityException {
-    MasterClientService.Iface client = null;
+  public static <T> T execute(Instance instance, ClientExecReturn<T,MasterClientService.Client> exec) throws AccumuloException, AccumuloSecurityException {
+    MasterClientService.Client client = null;
     while (true) {
       try {
         client = getConnectionWithRetry(instance);
@@ -105,8 +105,8 @@ public class MasterClient {
     }
   }
   
-  public static void execute(Instance instance, ClientExec<MasterClientService.Iface> exec) throws AccumuloException, AccumuloSecurityException {
-    MasterClientService.Iface client = null;
+  public static void execute(Instance instance, ClientExec<MasterClientService.Client> exec) throws AccumuloException, AccumuloSecurityException {
+    MasterClientService.Client client = null;
     while (true) {
       try {
         client = getConnectionWithRetry(instance);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java?rev=1359639&r1=1359638&r2=1359639&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ServerClient.java Tue Jul 10 12:39:52 2012
@@ -25,7 +25,7 @@ import org.apache.accumulo.core.client.A
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.impl.thrift.ClientService;
-import org.apache.accumulo.core.client.impl.thrift.ClientService.Iface;
+import org.apache.accumulo.core.client.impl.thrift.ClientService.Client;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.security.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.util.ArgumentChecker;
@@ -37,7 +37,6 @@ import org.apache.accumulo.core.util.Uti
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
 import org.apache.log4j.Logger;
-import org.apache.thrift.TServiceClient;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
 
@@ -54,7 +53,7 @@ public class ServerClient {
     return result;
   }
   
-  public static <T> T execute(Instance instance, ClientExecReturn<T,ClientService.Iface> exec) throws AccumuloException, AccumuloSecurityException {
+  public static <T> T execute(Instance instance, ClientExecReturn<T,ClientService.Client> exec) throws AccumuloException, AccumuloSecurityException {
     try {
       return executeRaw(instance, exec);
     } catch (ThriftSecurityException e) {
@@ -66,7 +65,7 @@ public class ServerClient {
     }
   }
   
-  public static void execute(Instance instance, ClientExec<ClientService.Iface> exec) throws AccumuloException, AccumuloSecurityException {
+  public static void execute(Instance instance, ClientExec<ClientService.Client> exec) throws AccumuloException, AccumuloSecurityException {
     try {
       executeRaw(instance, exec);
     } catch (ThriftSecurityException e) {
@@ -78,12 +77,12 @@ public class ServerClient {
     }
   }
   
-  public static <T> T executeRaw(Instance instance, ClientExecReturn<T,ClientService.Iface> exec) throws Exception {
+  public static <T> T executeRaw(Instance instance, ClientExecReturn<T,ClientService.Client> exec) throws Exception {
     while (true) {
-      ClientService.Iface client = null;
+      ClientService.Client client = null;
       String server = null;
       try {
-        Pair<String,Iface> pair = ServerClient.getConnection(instance);
+        Pair<String,Client> pair = ServerClient.getConnection(instance);
         server = pair.getFirst();
         client = pair.getSecond();
         return exec.execute(client);
@@ -97,12 +96,12 @@ public class ServerClient {
     }
   }
   
-  public static void executeRaw(Instance instance, ClientExec<ClientService.Iface> exec) throws Exception {
+  public static void executeRaw(Instance instance, ClientExec<ClientService.Client> exec) throws Exception {
     while (true) {
-      ClientService.Iface client = null;
+      ClientService.Client client = null;
       String server = null;
       try {
-        Pair<String,Iface> pair = ServerClient.getConnection(instance);
+        Pair<String,Client> pair = ServerClient.getConnection(instance);
         server = pair.getFirst();
         client = pair.getSecond();
         exec.execute(client);
@@ -119,11 +118,11 @@ public class ServerClient {
   
   static volatile boolean warnedAboutTServersBeingDown = false;
 
-  public static Pair<String,ClientService.Iface> getConnection(Instance instance) throws TTransportException {
+  public static Pair<String,ClientService.Client> getConnection(Instance instance) throws TTransportException {
     return getConnection(instance, true);
   }
   
-  public static Pair<String,ClientService.Iface> getConnection(Instance instance, boolean preferCachedConnections) throws TTransportException {
+  public static Pair<String,ClientService.Client> getConnection(Instance instance, boolean preferCachedConnections) throws TTransportException {
     ArgumentChecker.notNull(instance);
     // create list of servers
     ArrayList<ThriftTransportKey> servers = new ArrayList<ThriftTransportKey>();
@@ -143,10 +142,10 @@ public class ServerClient {
     boolean opened = false;
     try {
       Pair<String,TTransport> pair = ThriftTransportPool.getInstance().getAnyTransport(servers, preferCachedConnections);
-      ClientService.Iface client = ThriftUtil.createClient(new ClientService.Client.Factory(), pair.getSecond());
+      ClientService.Client client = ThriftUtil.createClient(new ClientService.Client.Factory(), pair.getSecond());
       opened = true;
       warnedAboutTServersBeingDown = false;
-      return new Pair<String,ClientService.Iface>(pair.getFirst(), client);
+      return new Pair<String,ClientService.Client>(pair.getFirst(), client);
     } finally {
       if (!opened) {
         if (!warnedAboutTServersBeingDown) {
@@ -161,8 +160,7 @@ public class ServerClient {
     }
   }
   
-  public static void close(ClientService.Iface iface) {
-    TServiceClient client = (TServiceClient) iface;
+  public static void close(ClientService.Client client) {
     if (client != null && client.getInputProtocol() != null && client.getInputProtocol().getTransport() != null) {
       ThriftTransportPool.getInstance().returnTransport(client.getInputProtocol().getTransport());
     } else {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java?rev=1359639&r1=1359638&r2=1359639&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java Tue Jul 10 12:39:52 2012
@@ -34,6 +34,7 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.accumulo.cloudtrace.instrument.TraceRunnable;
+import org.apache.accumulo.cloudtrace.instrument.Tracer;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -534,7 +535,7 @@ public class TabletServerBatchReaderIter
     
     TTransport transport = null;
     try {
-      TabletClientService.Iface client = ThriftUtil.getTServerClient(server, conf);
+      TabletClientService.Client client = ThriftUtil.getTServerClient(server, conf);
       try {
         OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Starting multi scan, tserver=" + server + "  #tablets=" + requested.size() + "  #ranges="
             + sumSizes(requested.values()) + " ssil=" + options.serverSideIteratorList + " ssio=" + options.serverSideIteratorOptions);
@@ -544,7 +545,7 @@ public class TabletServerBatchReaderIter
         
         Map<TKeyExtent,List<TRange>> thriftTabletRanges = Translator.translate(requested, Translator.KET, new Translator.ListTranslator<Range,TRange>(
             Translator.RT));
-        InitialMultiScan imsr = client.startMultiScan(null, credentials, thriftTabletRanges, Translator.translate(columns, Translator.CT),
+        InitialMultiScan imsr = client.startMultiScan(Tracer.traceInfo(), credentials, thriftTabletRanges, Translator.translate(columns, Translator.CT),
             options.serverSideIteratorList, options.serverSideIteratorOptions, ByteBufferUtil.toByteBuffers(authorizations.getAuthorizations()), waitForWrites);
         if (waitForWrites)
           ThriftScanner.serversWaitedForWrites.get(ttype).add(server);
@@ -567,7 +568,7 @@ public class TabletServerBatchReaderIter
         while (scanResult.more) {
           
           opTimer.start("Continuing multi scan, scanid=" + imsr.scanID);
-          scanResult = client.continueMultiScan(null, imsr.scanID);
+          scanResult = client.continueMultiScan(Tracer.traceInfo(), imsr.scanID);
           opTimer.stop("Got more multi scan results, #results=" + scanResult.results.size() + (scanResult.more ? "  scanID=" + imsr.scanID : "")
               + " in %DURATION%");
           
@@ -581,7 +582,7 @@ public class TabletServerBatchReaderIter
           trackScanning(failures, unscanned, scanResult);
         }
         
-        client.closeMultiScan(null, imsr.scanID);
+        client.closeMultiScan(Tracer.traceInfo(), imsr.scanID);
         
       } finally {
         ThriftUtil.returnClient(client);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java?rev=1359639&r1=1359638&r2=1359639&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java Tue Jul 10 12:39:52 2012
@@ -38,6 +38,8 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.accumulo.cloudtrace.instrument.Span;
 import org.apache.accumulo.cloudtrace.instrument.Trace;
+import org.apache.accumulo.cloudtrace.instrument.Tracer;
+import org.apache.accumulo.cloudtrace.thrift.TInfo;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -747,7 +749,7 @@ public class TabletServerBatchWriter {
       if (tabMuts.size() == 0) {
         return new MutationSet();
       }
-      
+      TInfo tinfo = Tracer.traceInfo();
       TTransport transport = null;
       
       try {
@@ -759,7 +761,7 @@ public class TabletServerBatchWriter {
             Entry<KeyExtent,List<Mutation>> entry = tabMuts.entrySet().iterator().next();
             
             try {
-              client.update(null, credentials, entry.getKey().toThrift(), entry.getValue().get(0).toThrift());
+              client.update(tinfo, credentials, entry.getKey().toThrift(), entry.getValue().get(0).toThrift());
             } catch (NotServingTabletException e) {
               allFailures.addAll(entry.getKey().getTableId().toString(), entry.getValue());
               TabletLocator.getInstance(instance, credentials, new Text(entry.getKey().getTableId())).invalidateCache(entry.getKey());
@@ -768,7 +770,7 @@ public class TabletServerBatchWriter {
             }
           } else {
             
-            long usid = client.startUpdate(null, credentials);
+            long usid = client.startUpdate(tinfo, credentials);
             
             List<TMutation> updates = new ArrayList<TMutation>();
             for (Entry<KeyExtent,List<Mutation>> entry : tabMuts.entrySet()) {
@@ -781,13 +783,13 @@ public class TabletServerBatchWriter {
                   size += mutation.numBytes();
                 }
                 
-                client.applyUpdates(null, usid, entry.getKey().toThrift(), updates);
+                client.applyUpdates(tinfo, usid, entry.getKey().toThrift(), updates);
                 updates.clear();
                 size = 0;
               }
             }
             
-            UpdateErrors updateErrors = client.closeUpdate(null, usid);
+            UpdateErrors updateErrors = client.closeUpdate(tinfo, usid);
             Map<KeyExtent,Long> failures = Translator.translate(updateErrors.failedExtents, Translator.TKET);
             updatedConstraintViolations(Translator.translate(updateErrors.violationSummaries, Translator.TCVST));
             updateAuthorizationFailures(Translator.translate(updateErrors.authorizationFailures, Translator.TKET));

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java?rev=1359639&r1=1359638&r2=1359639&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java Tue Jul 10 12:39:52 2012
@@ -29,6 +29,8 @@ import java.util.SortedSet;
 
 import org.apache.accumulo.cloudtrace.instrument.Span;
 import org.apache.accumulo.cloudtrace.instrument.Trace;
+import org.apache.accumulo.cloudtrace.instrument.Tracer;
+import org.apache.accumulo.cloudtrace.thrift.TInfo;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Instance;
@@ -116,7 +118,8 @@ public class ThriftScanner {
       throw new AccumuloException(new IOException());
     
     try {
-      TabletClientService.Iface client = ThriftUtil.getTServerClient(server, conf);
+      TInfo tinfo = Tracer.traceInfo();
+      TabletClientService.Client client = ThriftUtil.getTServerClient(server, conf);
       try {
         List<IterInfo> emptyList = Collections.emptyList();
         Map<String,Map<String,String>> emptyMap = Collections.emptyMap();
@@ -125,7 +128,7 @@ public class ThriftScanner {
         
         TabletType ttype = TabletType.type(extent);
         boolean waitForWrites = !serversWaitedForWrites.get(ttype).contains(server);
-        InitialScan isr = client.startScan(null, scanState.credentials, extent.toThrift(), scanState.range.toThrift(),
+        InitialScan isr = client.startScan(tinfo, scanState.credentials, extent.toThrift(), scanState.range.toThrift(),
             Translator.translate(scanState.columns, Translator.CT), scanState.size, scanState.serverSideIteratorList, scanState.serverSideIteratorOptions,
             scanState.authorizations.getAuthorizationsBB(), waitForWrites, scanState.isolated);
         if (waitForWrites)
@@ -136,7 +139,7 @@ public class ThriftScanner {
         for (TKeyValue kv : isr.result.results)
           results.put(new Key(kv.key), new Value(kv.value));
         
-        client.closeScan(null, isr.scanID);
+        client.closeScan(tinfo, isr.scanID);
         
         return isr.result.more;
       } finally {
@@ -393,7 +396,8 @@ public class ThriftScanner {
     
     OpTimer opTimer = new OpTimer(log, Level.TRACE);
     
-    TabletClientService.Iface client = ThriftUtil.getTServerClient(loc.tablet_location, conf);
+    TInfo tinfo = Tracer.traceInfo();
+    TabletClientService.Client client = ThriftUtil.getTServerClient(loc.tablet_location, conf);
     
     String old = Thread.currentThread().getName();
     try {
@@ -412,7 +416,7 @@ public class ThriftScanner {
         
         TabletType ttype = TabletType.type(loc.tablet_extent);
         boolean waitForWrites = !serversWaitedForWrites.get(ttype).contains(loc.tablet_location);
-        InitialScan is = client.startScan(null, scanState.credentials, loc.tablet_extent.toThrift(), scanState.range.toThrift(),
+        InitialScan is = client.startScan(tinfo, scanState.credentials, loc.tablet_extent.toThrift(), scanState.range.toThrift(),
             Translator.translate(scanState.columns, Translator.CT), scanState.size, scanState.serverSideIteratorList, scanState.serverSideIteratorOptions,
             scanState.authorizations.getAuthorizationsBB(), waitForWrites, scanState.isolated);
         if (waitForWrites)
@@ -423,7 +427,7 @@ public class ThriftScanner {
         if (sr.more)
           scanState.scanID = is.scanID;
         else
-          client.closeScan(null, is.scanID);
+          client.closeScan(tinfo, is.scanID);
         
       } else {
         // log.debug("Calling continue scan : "+scanState.range+"  loc = "+loc);
@@ -431,9 +435,9 @@ public class ThriftScanner {
         Thread.currentThread().setName(msg);
         opTimer.start(msg);
         
-        sr = client.continueScan(null, scanState.scanID);
+        sr = client.continueScan(tinfo, scanState.scanID);
         if (!sr.more) {
-          client.closeScan(null, scanState.scanID);
+          client.closeScan(tinfo, scanState.scanID);
           scanState.scanID = null;
         }
       }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java?rev=1359639&r1=1359638&r2=1359639&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java Tue Jul 10 12:39:52 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.accumulo.core.client.impl;
 
+import org.apache.accumulo.cloudtrace.instrument.Tracer;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Instance;
@@ -64,7 +65,7 @@ public class Writer {
     TabletClientService.Iface client = null;
     try {
       client = ThriftUtil.getTServerClient(server, configuration);
-      client.update(null, ai, extent.toThrift(), m.toThrift());
+      client.update(Tracer.traceInfo(), ai, extent.toThrift(), m.toThrift());
       return;
     } catch (ThriftSecurityException e) {
       throw new AccumuloSecurityException(e.user, e.code);



Mime
View raw message