[06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

[bh...@apache.org]

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	test/system/auto/README


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f6c268e5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6c268e5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6c268e5

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: f6c268e56b6428fbf9bb4da347ffe9406f2d8044
Parents: 8828328 ac18b56
Author: Bill Havanki <bh...@cloudera.com>
Authored: Wed Feb 19 11:11:06 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Wed Feb 19 11:11:06 2014 -0500

----------------------------------------------------------------------
 test/system/auto/README | 94 ++++++++++++++++++++++++++++++--------------
 1 file changed, 65 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6c268e5/test/system/auto/README
----------------------------------------------------------------------
diff --cc test/system/auto/README
index 7d18e8b,45ed158..41f6159
--- a/test/system/auto/README
+++ b/test/system/auto/README
@@@ -53,6 -63,32 +63,32 @@@ cluster at your disposal, you can run t
  
   $ python test/system/auto/run.py -l > tests
   $ hadoop fs -put tests /user/hadoop/tests
-  $ ./bin/accumulo org.apache.accumulo.test.functional.RunTests --tests /user/hadoop/tests --output /user/hadoop/results
 - $ ./bin/accumulo org.apache.accumulo.server.test.functional.RunTests \
 -   /user/hadoop/tests /user/hadoop/results
++ $ ./bin/accumulo org.apache.accumulo.test.functional.RunTests --tests \
++   /user/hadoop/tests --output /user/hadoop/results
+ 
+ The example above runs every test. You can trim the tests file to include
+ only the tests you wish to run.
+ 
+ In some clusters, the user under which MR jobs run is different from the user
+ under which Accumulo is installed, and this can cause failures running the
+ tests. Various configuration and permission changes can be made to help the
+ tests run, including the following:
+ 
+ * Opening up directory and file permissions on each cluster node so that the MR
+   user has the same read/write privileges as the Accumulo user. Adding the MR
+   user to a shared group is one easy way to accomplish this. Access is required
+   to the Accumulo installation, log, write-ahead log, and configuration
+   directories.
+ * Creating a user directory in HDFS, named after and owned by the MR user,
+   e.g., /user/mruser.
+ * Setting the ZOOKEEPER_HOME and HADOOP_CONF_DIR environment variables for the
+   MR user. These can be set using the mapred.child.env property in
+   mapred-site.xml, e.g.:
+ 
+   <property>
+     <name>mapred.child.env</name>
+     <value>ZOOKEEPER_HOME=/path/to/zookeeper,HADOOP_CONF_DIR=/path/to/hadoop/conf</value>
+   </property>
  
-  
+ Each functional test is run by a mapper, and so you can check the mapper logs
+ to see any error messages tests produce.