accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1450805 - in /accumulo/branches/1.5: core/src/main/java/org/apache/accumulo/core/cli/ core/src/main/java/org/apache/accumulo/core/client/impl/ core/src/test/java/org/apache/accumulo/core/cli/ core/src/test/java/org/apache/accumulo/core/uti...
Date Wed, 27 Feb 2013 15:28:26 GMT
Author: ecn
Date: Wed Feb 27 15:28:26 2013
New Revision: 1450805

URL: http://svn.apache.org/r1450805
Log:
ACCUMULO-1118 reverting inadvertent commits

Modified:
    accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
    accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
    accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
    accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
    accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
    accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java

Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java?rev=1450805&r1=1450804&r2=1450805&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
(original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
Wed Feb 27 15:28:26 2013
@@ -104,7 +104,7 @@ public class ClientOpts extends Help {
   public String principal = System.getProperty("user.name");
   
   @Parameter(names = "-p", converter = PasswordConverter.class, description = "Connection
password")
-  public Password password = new Password("secret");
+  public Password password = new Password("");
   
   @Parameter(names = "--password", converter = PasswordConverter.class, description = "Enter
the connection password", password = true)
   public Password securePassword = null;

Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java?rev=1450805&r1=1450804&r2=1450805&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
(original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
Wed Feb 27 15:28:26 2013
@@ -99,7 +99,7 @@ public class Writer {
         log.trace("Not serving tablet, server = " + tabLoc.tablet_location);
         TabletLocator.getInstance(instance, credentials, table).invalidateCache(tabLoc.tablet_extent);
       } catch (TException e) {
-        log.error("error sending update to " + tabLoc.tablet_location + ": " + e);
+        log.error("server = " + tabLoc.tablet_location, e);
         TabletLocator.getInstance(instance, credentials, table).invalidateCache(tabLoc.tablet_extent);
       } 
       

Modified: accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java?rev=1450805&r1=1450804&r2=1450805&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
(original)
+++ accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
Wed Feb 27 15:28:26 2013
@@ -43,7 +43,7 @@ public class TestClientOpts {
     BatchScannerOpts bsOpts = new BatchScannerOpts();
     assertEquals(System.getProperty("user.name"), args.principal);
     assertNull(args.securePassword);
-    assertEquals(new PasswordToken().setPassword("secret".getBytes()), args.getToken());
+    assertEquals(new PasswordToken().setPassword("".getBytes()), args.getToken());
     assertEquals(new Long(cfg.getMaxLatency(TimeUnit.MILLISECONDS)), bwOpts.batchLatency);
     assertEquals(new Long(cfg.getTimeout(TimeUnit.MILLISECONDS)), bwOpts.batchTimeout);
     assertEquals(new Long(cfg.getMaxMemory()), bwOpts.batchMemory);

Modified: accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java?rev=1450805&r1=1450804&r2=1450805&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
(original)
+++ accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
Wed Feb 27 15:28:26 2013
@@ -83,7 +83,7 @@ public class ShellTest {
     output = new TestOutputStream();
     shell = new Shell(new ConsoleReader(new FileInputStream(FileDescriptor.in), new OutputStreamWriter(output)));
     shell.setLogErrorsToConsole();
-    shell.config("--fake", "-p", "pass");
+    shell.config("--fake", "-p", "");
   }
   
   void assertGoodExit(String s, boolean stringPresent) {

Modified: accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java?rev=1450805&r1=1450804&r2=1450805&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
(original)
+++ accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
Wed Feb 27 15:28:26 2013
@@ -2891,10 +2891,9 @@ public class Tablet {
     }
     
     private int getNumFiles() {
-      // Locked tablets put themselves in the run queue, so we can't lock them
-      //synchronized (Tablet.this) {
+      synchronized (Tablet.this) {
         return datafileManager.datafileSizes.size();
-      //}
+      }
     }
     
     @Override

Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java?rev=1450805&r1=1450804&r2=1450805&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java
(original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java
Wed Feb 27 15:28:26 2013
@@ -21,7 +21,6 @@ import java.util.Set;
 
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.CredentialHelper;
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.security.tokens.PasswordToken;
@@ -54,7 +53,7 @@ public class SecurityFixture extends Fix
     conn.securityOperations().createUser(systemUserName, sysUserPass);
     
     WalkingSecurity.get(state).setTableName(secTableName);
-    state.set("rootUserPass", CredentialHelper.extractToken(state.getCredentials()));
+    state.set("rootUserPass", state.getCredentials().getToken());
     
     WalkingSecurity.get(state).setSysUserName(systemUserName);
     WalkingSecurity.get(state).createUser(systemUserName, sysUserPass);



Mime
View raw message