accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1438327 - in /accumulo/branches/ACCUMULO-259: proxy/src/main/java/org/apache/accumulo/proxy/ proxy/src/test/java/org/apache/accumulo/proxy/ server/src/main/java/org/apache/accumulo/server/master/ server/src/main/java/org/apache/accumulo/se...
Date Fri, 25 Jan 2013 05:27:18 GMT
Author: vines
Date: Fri Jan 25 05:27:18 2013
New Revision: 1438327

URL: http://svn.apache.org/viewvc?rev=1438327&view=rev
Log:
ACCUMULO-259 - All tests now work again


Modified:
    accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
    accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/Master.java
    accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
    accumulo/branches/ACCUMULO-259/test/system/auto/TestUtils.py

Modified: accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java?rev=1438327&r1=1438326&r2=1438327&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
(original)
+++ accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
Fri Jan 25 05:27:18 2013
@@ -143,7 +143,7 @@ public class ProxyServer implements Accu
   }
   
   protected Connector getConnector(UserPass userpass) throws Exception {
-    Connector connector = instance.getConnector(userpass.getUsername(), userpass.bufferForPassword());
+    Connector connector = instance.getConnector(new UserPassToken(userpass.getUsername(),
userpass.bufferForPassword()));
     return connector;
   }
   
@@ -589,7 +589,7 @@ public class ProxyServer implements Accu
   @Override
   public boolean authenticateUser(UserPass userpass, String user, ByteBuffer password) throws
TException {
     try {
-      return getConnector(userpass).securityOperations().authenticateUser(user, password.array());
+      return getConnector(userpass).securityOperations().authenticateUser(new UserPassToken(user,
password.array()));
     } catch (Exception e) {
       throw translateException(e);
     }
@@ -611,7 +611,7 @@ public class ProxyServer implements Accu
   @Override
   public void changeUserPassword(UserPass userpass, String user, ByteBuffer password) throws
TException {
     try {
-      getConnector(userpass).securityOperations().changeUserPassword(user, password.array());
+      getConnector(userpass).securityOperations().changeUserPassword(new UserPassToken(user,
password.array()));
     } catch (Exception e) {
       throw translateException(e);
     }

Modified: accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1438327&r1=1438326&r2=1438327&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
(original)
+++ accumulo/branches/ACCUMULO-259/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
Fri Jan 25 05:27:18 2013
@@ -482,7 +482,7 @@ public class SimpleTest {
   @AfterClass
   public static void tearDownMiniCluster() throws Exception {
     accumulo.stop();
-    folder.delete();
+//    folder.delete();
   }
   
 }

Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1438327&r1=1438326&r2=1438327&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/Master.java
(original)
+++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/master/Master.java
Fri Jan 25 05:27:18 2013
@@ -1022,7 +1022,7 @@ public class Master implements LiveTServ
           String tableName = ByteBufferUtil.toString(arguments.get(0));
           String exportDir = ByteBufferUtil.toString(arguments.get(1));
           
-          if (!security.canImport(itw, checkTableId(tableName, TableOperation.IMPORT)))
+          if (!security.canImport(itw))
             throw new ThriftSecurityException(itw.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
 
           checkNotMetadataTable(tableName, TableOperation.CREATE);

Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java?rev=1438327&r1=1438326&r2=1438327&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
(original)
+++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
Fri Jan 25 05:27:18 2013
@@ -841,7 +841,7 @@ public class SecurityOperation {
     return hasTablePermission(credentials.getPrincipal(), tableId, TablePermission.READ,
false);
   }
   
-  public boolean canImport(InstanceTokenWrapper credentials, String tableId) throws ThriftSecurityException
{
+  public boolean canImport(InstanceTokenWrapper credentials) throws ThriftSecurityException
{
     authenticate(credentials);
     return hasSystemPermission(credentials.getPrincipal(), SystemPermission.CREATE_TABLE,
false);
   }

Modified: accumulo/branches/ACCUMULO-259/test/system/auto/TestUtils.py
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/auto/TestUtils.py?rev=1438327&r1=1438326&r2=1438327&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/test/system/auto/TestUtils.py (original)
+++ accumulo/branches/ACCUMULO-259/test/system/auto/TestUtils.py Fri Jan 25 05:27:18 2013
@@ -274,7 +274,7 @@ class TestUtilsMixin:
         self.wait(self.runOn(host,
                              ['hadoop', 'fs', '-rmr', ACCUMULO_DIR]))
         handle = self.runOn(host, [self.accumulo_sh(), 'init','--clear-instance-name'], stdin=PIPE)
-        out, err = handle.communicate(INSTANCE_NAME+"\n"+ROOT_PASSWORD + "\n" + ROOT_PASSWORD+"\n")
+        out, err = handle.communicate(INSTANCE_NAME+"\nroot\n"+ROOT_PASSWORD + "\n" + ROOT_PASSWORD+"\n")
         self.processResult(out, err, handle.returncode)
 
     def setup_logging(self):



Mime
View raw message