Author: vines Date: Mon Oct 29 23:44:23 2012 New Revision: 1403580 URL: http://svn.apache.org/viewvc?rev=1403580&view=rev Log: A bit of merging and some basic imlementations for operations for ACCUMULO-259
Modified: accumulo/branches/ACCUMULO-259/ (props changed) accumulo/branches/ACCUMULO-259/README accumulo/branches/ACCUMULO-259/assemble/ (props changed) accumulo/branches/ACCUMULO-259/core/ (props changed) accumulo/branches/ACCUMULO-259/examples/pom.xml accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/branches/ACCUMULO-259/server/ (props changed) accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityFixture.java accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/WalkingSecurity.java accumulo/branches/ACCUMULO-259/src/ (props changed) Propchange: accumulo/branches/ACCUMULO-259/ ------------------------------------------------------------------------------ Merged /accumulo/trunk:r1403335-1403485 Modified: accumulo/branches/ACCUMULO-259/README URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/README?rev=1403580&r1=1403579&r2=1403580&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/README (original) +++ accumulo/branches/ACCUMULO-259/README Mon Oct 29 23:44:23 2012 @@ -67,9 +67,21 @@ have password-less ssh set up as describ You will need to have hadoop installed and configured on your system. Accumulo 1.5.0-SNAPSHOT has been tested with hadoop version 0.20.2. To avoid data loss, you must enable HDFS durable sync. How you enable this depends on your version -of Hadoop. For older versions of Hadoop set dfs.support.append to true in -hdfs-site.xml. For newer versions set dfs.durable.sync to true. After setting -these properties restart HDFS. See ACCUMULO-623 for more information. +of Hadoop. Please consult the table below for information regarding your version. +If you need to set the coniguration, please be sure to restart HDFS. See +ACCUMULO-623 for more information. + +HADOOP RELEASE VERSION SYNC NAME DEFAULT +Apache Hadoop 0.20.205 dfs.support.append false +Apache Hadoop 0.23.x dfs.support.append true +Apache Hadoop 1.0.x dfs.support.append false +Apache Hadoop 1.1.x dfs.durable.sync true +Apache Hadoop 2.0.0-2.0.2 dfs.support.append true +Cloudera CDH 3u0-3u3 ???? true +Cloudera CDH 3u4 dfs.support.append true +Hortonworks HDP `1.0 dfs.support.append false +Hortonworks HDP `1.1 dfs.support.append false + The example accumulo configuration files are placed in directories based on the memory footprint for the accumulo processes. If you are using native libraries Propchange: accumulo/branches/ACCUMULO-259/assemble/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/assemble:r1403335-1403485 Propchange: accumulo/branches/ACCUMULO-259/core/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/core:r1403335-1403485 Modified: accumulo/branches/ACCUMULO-259/examples/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/examples/pom.xml?rev=1403580&r1=1403579&r2=1403580&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/examples/pom.xml (original) +++ accumulo/branches/ACCUMULO-259/examples/pom.xml Mon Oct 29 23:44:23 2012 @@ -28,7 +28,6 @@ <modules> <module>simple</module> - <module>wikisearch</module> </modules> <repositories> Propchange: accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java ------------------------------------------------------------------------------ Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1403335-1403485 Propchange: accumulo/branches/ACCUMULO-259/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java ------------------------------------------------------------------------------ Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1403335-1403485 Propchange: accumulo/branches/ACCUMULO-259/server/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/server:r1403335-1403485 Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1403580&r1=1403579&r2=1403580&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java Mon Oct 29 23:44:23 2012 @@ -3149,7 +3149,17 @@ public class TabletServer extends Abstra private static void ensureHdfsSyncIsEnabled(FileSystem fs) { if (fs instanceof DistributedFileSystem) { if (!fs.getConf().getBoolean("dfs.durable.sync", false) && !fs.getConf().getBoolean("dfs.support.append", false)) { - String msg = "Must set dfs.durable.sync OR dfs.support.append to true. Which one needs to be set depends on your version of HDFS. See ACCUMULO-623."; + String msg = "Must set dfs.durable.sync OR dfs.support.append to true. Which one needs to be set depends on your version of HDFS. See ACCUMULO-623. \n"+ + "HADOOP RELEASE VERSION SYNC NAME DEFAULT\n"+ + "Apache Hadoop 0.20.205 dfs.support.append false\n"+ + "Apache Hadoop 0.23.x dfs.support.append true\n"+ + "Apache Hadoop 1.0.x dfs.support.append false\n"+ + "Apache Hadoop 1.1.x dfs.durable.sync true\n"+ + "Apache Hadoop 2.0.0-2.0.2 dfs.support.append true\n"+ + "Cloudera CDH 3u0-3u3 ???? true\n"+ + "Cloudera CDH 3u4 dfs.support.append true\n"+ + "Hortonworks HDP `1.0 dfs.support.append false\n"+ + "Hortonworks HDP `1.1 dfs.support.append false"; log.fatal(msg); System.exit(-1); } Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityFixture.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityFixture.java?rev=1403580&r1=1403579&r2=1403580&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityFixture.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityFixture.java Mon Oct 29 23:44:23 2012 @@ -49,6 +49,7 @@ public class SecurityFixture extends Fix WalkingSecurity.get(state).createUser(systemUserName, sysUserPass); WalkingSecurity.get(state).changePassword(tableUserName, new byte[0]); + WalkingSecurity.get(state).setSystemConnector(sysConn); WalkingSecurity.get(state).setTableName(secTableName); WalkingSecurity.get(state).setTabUserName(tableUserName); Modified: accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/WalkingSecurity.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/WalkingSecurity.java?rev=1403580&r1=1403579&r2=1403580&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/WalkingSecurity.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/WalkingSecurity.java Mon Oct 29 23:44:23 2012 @@ -45,7 +45,7 @@ import org.apache.log4j.Logger; * */ public class WalkingSecurity extends SecurityOperation implements Authorizor, Authenticator, PermissionHandler { - State state; + State state= null; protected final static Logger log = Logger.getLogger(WalkingSecurity.class); private static final String tableName = "secTableName"; @@ -76,7 +76,7 @@ public class WalkingSecurity extends Sec } public static WalkingSecurity get(State state) { - if (instance != null && instance.state != state) { + if (instance == null || instance.state != state) { instance = new WalkingSecurity(state); state.set(tableExists, Boolean.toString(false)); state.set(authsMap, new HashMap<String,Integer>()); @@ -274,6 +274,10 @@ public class WalkingSecurity extends Sec return toRet; } + public void setSystemConnector(Connector conn) throws AccumuloException, AccumuloSecurityException { + state.set("system" + connector, conn); + } + public Connector getTableConnector() throws AccumuloException, AccumuloSecurityException { Connector toRet = (Connector) state.get("table" + connector); if (toRet == null) { Propchange: accumulo/branches/ACCUMULO-259/src/ ------------------------------------------------------------------------------ Merged /accumulo/trunk/src:r1403335-1403485