Author: vines
Date: Fri Nov 2 19:03:22 2012
New Revision: 1405104
URL: http://svn.apache.org/viewvc?rev=1405104&view=rev
Log:
ACCUMULO-259 Making things a bit more quiet
Modified:
accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.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/handler/ZKAuthenticator.java
accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
accumulo/branches/ACCUMULO-259/test/system/randomwalk/conf/modules/Security.xml
Modified:
accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java?rev=1405104&r1=1405103&r2=1405104&view=diff
==============================================================================
---
accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
(original)
+++
accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
Fri Nov 2 19:03:22 2012
@@ -1111,7 +1111,7 @@ import org.slf4j.LoggerFactory;
for (int _i1 = 0; _i1 < _map0.size; ++_i1)
{
String _key2; // required
- TableInfo _val3; // required
+ TableInfo _val3; // optional
_key2 = iprot.readString();
_val3 = new TableInfo();
_val3.read(iprot);
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=1405104&r1=1405103&r2=1405104&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 Nov 2 19:03:22 2012
@@ -457,6 +457,12 @@ public class Master implements LiveTServ
log.warn(why);
throw new ThriftTableOperationException(null, tableName, operation,
TableOperationExceptionType.OTHER, why);
}
+ if
(Tables.getNameToIdMap(HdfsZooInstance.getInstance()).containsKey(tableName))
+ {
+ String why = "Table name already exists: " + tableName;
+ throw new ThriftTableOperationException(null, tableName, operation,
TableOperationExceptionType.EXISTS, why);
+ }
+
}
public void mustBeOnline(final String tableId) throws
ThriftTableOperationException {
Modified:
accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java?rev=1405104&r1=1405103&r2=1405104&view=diff
==============================================================================
---
accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
(original)
+++
accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
Fri Nov 2 19:03:22 2012
@@ -110,7 +110,6 @@ public final class ZKAuthenticator imple
try {
constructUser(user, ZKSecurityTool.createPass(pass));
} catch (KeeperException e) {
- log.error(e, e);
if (e.code().equals(KeeperException.Code.NODEEXISTS))
throw new AccumuloSecurityException(user,
SecurityErrorCode.USER_EXISTS, e);
throw new AccumuloSecurityException(user,
SecurityErrorCode.CONNECTION_ERROR, e);
@@ -134,9 +133,9 @@ public final class ZKAuthenticator imple
log.error(e, e);
throw new RuntimeException(e);
} catch (KeeperException e) {
- log.error(e, e);
if (e.code().equals(KeeperException.Code.NONODE))
throw new AccumuloSecurityException(user,
SecurityErrorCode.USER_DOESNT_EXIST, e);
+ log.error(e, e);
throw new AccumuloSecurityException(user,
SecurityErrorCode.CONNECTION_ERROR, e);
}
}
Modified:
accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java?rev=1405104&r1=1405103&r2=1405104&view=diff
==============================================================================
---
accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
(original)
+++
accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
Fri Nov 2 19:03:22 2012
@@ -59,7 +59,6 @@ public class ChangePass extends Test {
newPass[i] = (byte) ((r.nextInt(26)+65) & 0xFF);
try {
- log.debug("Changing password for user " + target + " to " + new
String(newPass));
conn.securityOperations().changeUserPassword(target, newPass);
} catch (AccumuloSecurityException ae) {
switch (ae.getErrorCode()) {
Modified:
accumulo/branches/ACCUMULO-259/test/system/randomwalk/conf/modules/Security.xml
URL:
http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/randomwalk/conf/modules/Security.xml?rev=1405104&r1=1405103&r2=1405104&view=diff
==============================================================================
---
accumulo/branches/ACCUMULO-259/test/system/randomwalk/conf/modules/Security.xml
(original)
+++
accumulo/branches/ACCUMULO-259/test/system/randomwalk/conf/modules/Security.xml
Fri Nov 2 19:03:22 2012
@@ -1,227 +1,224 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+ license agreements. See the NOTICE file distributed with this work for
additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<module>
-<package prefix="security"
value="org.apache.accumulo.server.test.randomwalk.security"/>
+ <package prefix="security"
+ value="org.apache.accumulo.server.test.randomwalk.security" />
-<fixture id="security.SecurityFixture"/>
+ <fixture id="security.SecurityFixture" />
-<init id="dummy.NoUserNoTable" maxHops="1000000"/>
+ <init id="dummy.NoUserNoTable" maxHops="1000000" />
-<node id="security.CreateUser">
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="CreateUserYesTable" src="security.CreateUser">
- <edge id="dummy.YesUserYesTable" weight="1"/>
-</node>
-
-<node id="CreateUserNoTable" src="security.CreateUser">
- <edge id="dummy.YesUserNoTable" weight="1"/>
-</node>
-
-<node id="security.DropUser">
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="DropUserNoTable" src="security.DropUser">
- <edge id="dummy.NoUserNoTable" weight="1"/>
-</node>
-
-<node id="DropUserYesTable" src="security.DropUser">
- <edge id="dummy.NoUserYesTable" weight="1"/>
-</node>
-
-<node id="security.CreateTable">
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="NoUserCreateTable" src="security.CreateTable">
- <edge id="dummy.NoUserYesTable" weight="1"/>
-</node>
-
-<node id="YesUserCreateTable" src="security.CreateTable">
- <edge id="dummy.YesUserYesTable" weight="1"/>
-</node>
-
-<node id="security.DropTable">
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="NoUserDropTable" src="security.DropTable">
- <edge id="dummy.NoUserNoTable" weight="1"/>
-</node>
-
-<node id="YesUserDropTable" src="security.DropTable">
- <edge id="dummy.YesUserNoTable" weight="1"/>
-</node>
-
-<node id="security.AlterTable">
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="RandomAuths" src="security.SetAuths">
- <property key="auths" value="_random"/>
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="SystemChangeSystemPass" src="security.ChangePass">
- <property key="target" value="system"/>
- <property key="source" value="system"/>
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="SystemChangeTablePass" src="security.ChangePass">
- <property key="target" value="table"/>
- <property key="source" value="system"/>
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="TableChangeTablePass" src="security.ChangePass">
- <property key="target" value="table"/>
- <property key="source" value="table"/>
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="AuthenticateSystemRight" src="security.Authenticate">
- <property key="target" value="system"/>
- <property key="valid" value="true"/>
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="AuthenticateSystemWrong" src="security.Authenticate">
- <property key="target" value="system"/>
- <property key="valid" value="false"/>
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="AuthenticateTableRight" src="security.Authenticate">
- <property key="target" value="table"/>
- <property key="valid" value="true"/>
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="AuthenticateTableWrong" src="security.Authenticate">
- <property key="target" value="table"/>
- <property key="valid" value="false"/>
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="security.Validate">
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="security.AlterSystemPerm">
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="security.AlterTablePerm">
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="security.TableOp">
- <edge id="alias.last" weight="1"/>
-</node>
-
-<node id="dummy.NoUserNoTable">
- <alias name="last"/>
- <property key="print" value="DEBUG"/>
- <edge id="CreateUserNoTable" weight="40"/>
- <edge id="security.DropUser" weight="10"/>
- <edge id="NoUserCreateTable" weight="40"/>
- <edge id="security.DropTable" weight="10"/>
- <edge id="security.AlterTable" weight="10"/>
- <edge id="SystemChangeSystemPass" weight="60"/>
- <edge id="SystemChangeTablePass" weight="10"/>
- <edge id="AuthenticateSystemRight" weight="50"/>
- <edge id="AuthenticateSystemWrong" weight="50"/>
- <edge id="AuthenticateTableRight" weight="10"/>
- <edge id="AuthenticateTableWrong" weight="10"/>
- <edge id="security.Validate" weight="20"/>
- <edge id="RandomAuths" weight="10"/>
- <edge id="security.AlterSystemPerm" weight="60"/>
- <edge id="security.AlterTablePerm" weight="10"/>
-</node>
-
-<node id="dummy.YesUserNoTable">
- <alias name="last"/>
- <property key="print" value="DEBUG"/>
- <edge id="security.CreateUser" weight="10"/>
- <edge id="DropUserNoTable" weight="30"/>
- <edge id="YesUserCreateTable" weight="40"/>
- <edge id="security.DropTable" weight="10"/>
- <edge id="security.AlterTable" weight="10"/>
- <edge id="SystemChangeSystemPass" weight="60"/>
- <edge id="SystemChangeTablePass" weight="60"/>
- <edge id="TableChangeTablePass" weight="60"/>
- <edge id="AuthenticateSystemRight" weight="50"/>
- <edge id="AuthenticateSystemWrong" weight="50"/>
- <edge id="AuthenticateTableRight" weight="50"/>
- <edge id="AuthenticateTableWrong" weight="50"/>
- <edge id="security.Validate" weight="20"/>
- <edge id="RandomAuths" weight="60"/>
- <edge id="security.AlterSystemPerm" weight="60"/>
- <edge id="security.AlterTablePerm" weight="10"/>
- <edge id="security.TableOp" weight="10"/>
-
-</node>
-
-<node id="dummy.NoUserYesTable">
- <alias name="last"/>
- <property key="print" value="DEBUG"/>
- <edge id="CreateUserYesTable" weight="40"/>
- <edge id="security.DropUser" weight="10"/>
- <edge id="security.CreateTable" weight="10"/>
- <edge id="NoUserDropTable" weight="30"/>
- <edge id="security.AlterTable" weight="60"/>
- <edge id="SystemChangeSystemPass" weight="60"/>
- <edge id="SystemChangeTablePass" weight="10"/>
- <edge id="AuthenticateSystemRight" weight="50"/>
- <edge id="AuthenticateSystemWrong" weight="50"/>
- <edge id="AuthenticateTableRight" weight="10"/>
- <edge id="AuthenticateTableWrong" weight="10"/>
- <edge id="security.Validate" weight="20"/>
- <edge id="RandomAuths" weight="10"/>
- <edge id="security.AlterSystemPerm" weight="60"/>
- <edge id="security.AlterTablePerm" weight="10"/>
-</node>
-
-<node id="dummy.YesUserYesTable">
- <alias name="last"/>
- <property key="print" value="DEBUG"/>
- <edge id="security.CreateUser" weight="10"/>
- <edge id="DropUserYesTable" weight="30"/>
- <edge id="security.CreateTable" weight="10"/>
- <edge id="YesUserDropTable" weight="30"/>
- <edge id="security.AlterTable" weight="60"/>
- <edge id="SystemChangeSystemPass" weight="60"/>
- <edge id="SystemChangeTablePass" weight="60"/>
- <edge id="TableChangeTablePass" weight="60"/>
- <edge id="AuthenticateSystemRight" weight="50"/>
- <edge id="AuthenticateSystemWrong" weight="50"/>
- <edge id="AuthenticateTableRight" weight="50"/>
- <edge id="AuthenticateTableWrong" weight="50"/>
- <edge id="security.Validate" weight="20"/>
- <edge id="RandomAuths" weight="60"/>
- <edge id="security.AlterSystemPerm" weight="60"/>
- <edge id="security.AlterTablePerm" weight="60"/>
- <edge id="security.TableOp" weight="120"/>
-
-</node>
+ <node id="security.CreateUser">
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="CreateUserYesTable" src="security.CreateUser">
+ <edge id="dummy.YesUserYesTable" weight="1" />
+ </node>
+
+ <node id="CreateUserNoTable" src="security.CreateUser">
+ <edge id="dummy.YesUserNoTable" weight="1" />
+ </node>
+
+ <node id="security.DropUser">
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="DropUserNoTable" src="security.DropUser">
+ <edge id="dummy.NoUserNoTable" weight="1" />
+ </node>
+
+ <node id="DropUserYesTable" src="security.DropUser">
+ <edge id="dummy.NoUserYesTable" weight="1" />
+ </node>
+
+ <node id="security.CreateTable">
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="NoUserCreateTable" src="security.CreateTable">
+ <edge id="dummy.NoUserYesTable" weight="1" />
+ </node>
+
+ <node id="YesUserCreateTable" src="security.CreateTable">
+ <edge id="dummy.YesUserYesTable" weight="1" />
+ </node>
+
+ <node id="security.DropTable">
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="NoUserDropTable" src="security.DropTable">
+ <edge id="dummy.NoUserNoTable" weight="1" />
+ </node>
+
+ <node id="YesUserDropTable" src="security.DropTable">
+ <edge id="dummy.YesUserNoTable" weight="1" />
+ </node>
+
+ <node id="security.AlterTable">
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="RandomAuths" src="security.SetAuths">
+ <property key="auths" value="_random" />
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="SystemChangeSystemPass" src="security.ChangePass">
+ <property key="target" value="system" />
+ <property key="source" value="system" />
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="SystemChangeTablePass" src="security.ChangePass">
+ <property key="target" value="table" />
+ <property key="source" value="system" />
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="TableChangeTablePass" src="security.ChangePass">
+ <property key="target" value="table" />
+ <property key="source" value="table" />
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="AuthenticateSystemRight" src="security.Authenticate">
+ <property key="target" value="system" />
+ <property key="valid" value="true" />
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="AuthenticateSystemWrong" src="security.Authenticate">
+ <property key="target" value="system" />
+ <property key="valid" value="false" />
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="AuthenticateTableRight" src="security.Authenticate">
+ <property key="target" value="table" />
+ <property key="valid" value="true" />
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="AuthenticateTableWrong" src="security.Authenticate">
+ <property key="target" value="table" />
+ <property key="valid" value="false" />
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="security.Validate">
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="security.AlterSystemPerm">
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="security.AlterTablePerm">
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="security.TableOp">
+ <edge id="alias.last" weight="1" />
+ </node>
+
+ <node id="dummy.NoUserNoTable">
+ <alias name="last" />
+ <property key="print" value="DEBUG" />
+ <edge id="CreateUserNoTable" weight="40" />
+ <edge id="security.DropUser" weight="10" />
+ <edge id="NoUserCreateTable" weight="40" />
+ <edge id="security.DropTable" weight="10" />
+ <edge id="security.AlterTable" weight="10" />
+ <edge id="SystemChangeSystemPass" weight="60" />
+ <edge id="SystemChangeTablePass" weight="10" />
+ <edge id="AuthenticateSystemRight" weight="50" />
+ <edge id="AuthenticateSystemWrong" weight="50" />
+ <edge id="AuthenticateTableRight" weight="10" />
+ <edge id="AuthenticateTableWrong" weight="10" />
+ <edge id="security.Validate" weight="20" />
+ <edge id="RandomAuths" weight="10" />
+ <edge id="security.AlterSystemPerm" weight="60" />
+ <edge id="security.AlterTablePerm" weight="10" />
+ <edge id="END" weight="1" />
+ </node>
+
+ <node id="dummy.YesUserNoTable">
+ <alias name="last" />
+ <property key="print" value="DEBUG" />
+ <edge id="security.CreateUser" weight="10" />
+ <edge id="DropUserNoTable" weight="30" />
+ <edge id="YesUserCreateTable" weight="40" />
+ <edge id="security.DropTable" weight="10" />
+ <edge id="security.AlterTable" weight="10" />
+ <edge id="SystemChangeSystemPass" weight="60" />
+ <edge id="SystemChangeTablePass" weight="60" />
+ <edge id="TableChangeTablePass" weight="60" />
+ <edge id="AuthenticateSystemRight" weight="50" />
+ <edge id="AuthenticateSystemWrong" weight="50" />
+ <edge id="AuthenticateTableRight" weight="50" />
+ <edge id="AuthenticateTableWrong" weight="50" />
+ <edge id="security.Validate" weight="20" />
+ <edge id="RandomAuths" weight="60" />
+ <edge id="security.AlterSystemPerm" weight="60" />
+ <edge id="security.AlterTablePerm" weight="10" />
+ <edge id="security.TableOp" weight="10" />
+ <edge id="END" weight="1" />
+ </node>
+
+ <node id="dummy.NoUserYesTable">
+ <alias name="last" />
+ <property key="print" value="DEBUG" />
+ <edge id="CreateUserYesTable" weight="40" />
+ <edge id="security.DropUser" weight="10" />
+ <edge id="security.CreateTable" weight="10" />
+ <edge id="NoUserDropTable" weight="30" />
+ <edge id="security.AlterTable" weight="60" />
+ <edge id="SystemChangeSystemPass" weight="60" />
+ <edge id="SystemChangeTablePass" weight="10" />
+ <edge id="AuthenticateSystemRight" weight="50" />
+ <edge id="AuthenticateSystemWrong" weight="50" />
+ <edge id="AuthenticateTableRight" weight="10" />
+ <edge id="AuthenticateTableWrong" weight="10" />
+ <edge id="security.Validate" weight="20" />
+ <edge id="RandomAuths" weight="10" />
+ <edge id="security.AlterSystemPerm" weight="60" />
+ <edge id="security.AlterTablePerm" weight="10" />
+ <edge id="END" weight="1" />
+ </node>
+
+ <node id="dummy.YesUserYesTable">
+ <alias name="last" />
+ <property key="print" value="DEBUG" />
+ <edge id="security.CreateUser" weight="10" />
+ <edge id="DropUserYesTable" weight="30" />
+ <edge id="security.CreateTable" weight="10" />
+ <edge id="YesUserDropTable" weight="30" />
+ <edge id="security.AlterTable" weight="60" />
+ <edge id="SystemChangeSystemPass" weight="60" />
+ <edge id="SystemChangeTablePass" weight="60" />
+ <edge id="TableChangeTablePass" weight="60" />
+ <edge id="AuthenticateSystemRight" weight="50" />
+ <edge id="AuthenticateSystemWrong" weight="50" />
+ <edge id="AuthenticateTableRight" weight="50" />
+ <edge id="AuthenticateTableWrong" weight="50" />
+ <edge id="security.Validate" weight="20" />
+ <edge id="RandomAuths" weight="60" />
+ <edge id="security.AlterSystemPerm" weight="60" />
+ <edge id="security.AlterTablePerm" weight="60" />
+ <edge id="security.TableOp" weight="120" />
+ <edge id="END" weight="1" />
+ </node>
</module>
