Modified: accumulo/trunk/test/system/continuous/start-walkers.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/continuous/start-walkers.sh?rev=1423923&r1=1423922&r2=1423923&view=diff ============================================================================== --- accumulo/trunk/test/system/continuous/start-walkers.sh (original) +++ accumulo/trunk/test/system/continuous/start-walkers.sh Wed Dec 19 16:25:03 2012 @@ -30,5 +30,5 @@ if [ -n "$AUTHS" ] ; then fi -pssh -h walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousWalk $DEBUG_OPT $AUTH_OPT $INSTANCE_NAME $ZOO_KEEPERS $USER $PASS $TABLE $MIN $MAX $SLEEP_TIME >$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_walk.out 2>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_walk.err &" < /dev/null +pssh -h walkers.txt "mkdir -p $CONTINUOUS_LOG_DIR; nohup $ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.test.continuous.ContinuousWalk $DEBUG_OPT $AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS -t $TABLE --min $MIN --max $MAX --sleep $SLEEP_TIME >$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_walk.out 2>$CONTINUOUS_LOG_DIR/\`date +%Y%m%d%H%M%S\`_\`hostname\`_walk.err &" < /dev/null
Modified: accumulo/trunk/test/system/randomwalk/bin/start-local.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/randomwalk/bin/start-local.sh?rev=1423923&r1=1423922&r2=1423923&view=diff ============================================================================== --- accumulo/trunk/test/system/randomwalk/bin/start-local.sh (original) +++ accumulo/trunk/test/system/randomwalk/bin/start-local.sh Wed Dec 19 16:25:03 2012 @@ -72,4 +72,4 @@ fi LOG_ID=`hostname -s`_`date +%Y%m%d_%H%M%S` # run the local walker -"$ACCUMULO_HOME/bin/accumulo" org.apache.accumulo.server.test.randomwalk.Framework "$RW_HOME/$TEMP/conf/" "$RW_LOGS" "$LOG_ID" "$1" >"$RW_LOGS/$LOG_ID.out" 2>"$RW_LOGS/$LOG_ID.err" & +"$ACCUMULO_HOME/bin/accumulo" org.apache.accumulo.server.test.randomwalk.Framework --configDir "$RW_HOME/$TEMP/conf/" --logDir "$RW_LOGS" --logId "$LOG_ID" --module "$1" >"$RW_LOGS/$LOG_ID.out" 2>"$RW_LOGS/$LOG_ID.err" & Modified: accumulo/trunk/test/system/test1/ingest_test.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/test1/ingest_test.sh?rev=1423923&r1=1423922&r2=1423923&view=diff ============================================================================== --- accumulo/trunk/test/system/test1/ingest_test.sh (original) +++ accumulo/trunk/test/system/test1/ingest_test.sh Wed Dec 19 16:25:03 2012 @@ -15,8 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 1000000 0 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 1000000 1000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 1000000 2000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 1000000 3000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 1000000 4000000 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 1000000 --start 0 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 1000000 --start 1000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 1000000 --start 2000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 1000000 --start 3000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 1000000 --start 4000000 --cols 1 & Modified: accumulo/trunk/test/system/test1/ingest_test_2.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/test1/ingest_test_2.sh?rev=1423923&r1=1423922&r2=1423923&view=diff ============================================================================== --- accumulo/trunk/test/system/test1/ingest_test_2.sh (original) +++ accumulo/trunk/test/system/test1/ingest_test_2.sh Wed Dec 19 16:25:03 2012 @@ -15,8 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 1000000 0 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 1000000 1000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 1000000 2000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 1000000 3000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 1000000 4000000 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --timeestamp 2 --size 50 --random 57 --rows 1000000 --start 0 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --timeestamp 2 --size 50 --random 57 --rows 1000000 --start 1000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --timeestamp 2 --size 50 --random 57 --rows 1000000 --start 2000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --timeestamp 2 --size 50 --random 57 --rows 1000000 --start 3000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --timeestamp 2 --size 50 --random 57 --rows 1000000 --start 4000000 --cols 1 & Modified: accumulo/trunk/test/system/test1/verify_test.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/test1/verify_test.sh?rev=1423923&r1=1423922&r2=1423923&view=diff ============================================================================== --- accumulo/trunk/test/system/test1/verify_test.sh (original) +++ accumulo/trunk/test/system/test1/verify_test.sh Wed Dec 19 16:25:03 2012 @@ -15,8 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 0 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 1000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 2000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 3000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 4000000 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 0 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 1000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 2000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 3000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 4000000 --cols 1 & Modified: accumulo/trunk/test/system/test1/verify_test_2.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/test1/verify_test_2.sh?rev=1423923&r1=1423922&r2=1423923&view=diff ============================================================================== --- accumulo/trunk/test/system/test1/verify_test_2.sh (original) +++ accumulo/trunk/test/system/test1/verify_test_2.sh Wed Dec 19 16:25:03 2012 @@ -15,8 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 0 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 1000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 2000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 3000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 4000000 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 1000000 --start 0 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 1000000 --start 1000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 1000000 --start 2000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 1000000 --start 3000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 1000000 --start 4000000 --cols 1 & Modified: accumulo/trunk/test/system/test2/concurrent.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/test2/concurrent.sh?rev=1423923&r1=1423922&r2=1423923&view=diff ============================================================================== --- accumulo/trunk/test/system/test2/concurrent.sh (original) +++ accumulo/trunk/test/system/test2/concurrent.sh Wed Dec 19 16:25:03 2012 @@ -17,80 +17,80 @@ echo "ingesting first halves (0 to (500K - 1), 1M to (1.5M - 1), etc)" -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 500000 0 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 500000 1000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 500000 2000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 500000 3000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 500000 4000000 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 5000000 --start 0 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 5000000 --start 1000000 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 5000000 --start 2000000 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 5000000 --start 3000000 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 5000000 --start 4000000 1 & wait echo "ingesting second halves (500K to (1M - 1), 1.5M to (2M - 1), etc) and verifying first halves" -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 500000 0 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 500000 1000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 500000 2000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 500000 3000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 500000 4000000 1 & - -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 500000 500000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 500000 1500000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 500000 2500000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 500000 3500000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 500000 4500000 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 5000000 --start 0 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 5000000 --start 1000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 5000000 --start 2000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 5000000 --start 3000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 5000000 --start 4000000 --cols 1 & + +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 5000000 --start 500000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 5000000 --start 1500000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 5000000 --start 2500000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 5000000 --start 3500000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 5000000 --start 4500000 --cols 1 & wait echo "verifying complete range" -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 0 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 1000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 2000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 3000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 4000000 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 0 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 1000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 2000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 3000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 4000000 --cols 1 & wait echo "ingesting first halves (0 to (500K - 1), 1M to (1.5M - 1), etc) w/ new timestamp AND verifying second half w/ old timestamp" -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 500000 0 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 500000 1000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 500000 2000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 500000 3000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 500000 4000000 1 & - -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 500000 500000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 500000 1500000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 500000 2500000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 500000 3500000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 500000 4500000 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 500000 --start 0 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 500000 --start 1000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 500000 --start 2000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 500000 --start 3000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 500000 --start 4000000 --cols 1 & + +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 5000000 --start 500000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 5000000 --start 1500000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 5000000 --start 2500000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 5000000 --start 3500000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 5000000 --start 4500000 --cols 1 & wait echo "ingesting second halves (500K to (1M - 1), 1.5M to (2M - 1), etc) and verifying first halves" -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 500000 0 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 500000 1000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 500000 2000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 500000 3000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 500000 4000000 1 & - -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 500000 500000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 500000 1500000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 500000 2500000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 500000 3500000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 500000 4500000 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 500000 --start 0 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 500000 --start 1000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 500000 --start 2000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 500000 --start 3000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 500000 --start 4000000 --cols 1 & + +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 500000 --start 500000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 500000 --start 1500000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 500000 --start 2500000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 500000 --start 3500000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 500000 --start 4500000 --cols 1 & wait echo "verifying complete range" -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 0 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 1000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 2000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 3000000 1 & -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 4000000 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 1000000 0 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 1000000 1000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 1000000 2000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 1000000 3000000 --cols 1 & +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 1000000 4000000 --cols 1 & wait Modified: accumulo/trunk/test/system/test3/bigrow.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/test3/bigrow.sh?rev=1423923&r1=1423922&r2=1423923&view=diff ============================================================================== --- accumulo/trunk/test/system/test3/bigrow.sh (original) +++ accumulo/trunk/test/system/test3/bigrow.sh Wed Dec 19 16:25:03 2012 @@ -15,9 +15,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 1 5000000 2000000; -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 1000000 0 1; -#../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -timestamp 1 -size 50 -random 56 1 5000000 2000000; -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 0 1; -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 1000000 7000000 1; -../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 7000000 1; +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 1 --start 5000000 --cols 2000000; +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 1000000 --start 0 --cols 1; +#../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --timestamp 1 --size 50 --random 56 --rows 1 --start 5000000 --cols 2000000; +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 0 --cols 1; +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.TestIngest --timestamp 1 --size 50 --random 56 --rows 1000000 --start 7000000 --cols 1; +../../../bin/accumulo jar ../../../lib/accumulo.jar org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 7000000 --cols 1; Modified: accumulo/trunk/test/system/test4/bulk_import_test.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/test4/bulk_import_test.sh?rev=1423923&r1=1423922&r2=1423923&view=diff ============================================================================== --- accumulo/trunk/test/system/test4/bulk_import_test.sh (original) +++ accumulo/trunk/test/system/test4/bulk_import_test.sh Wed Dec 19 16:25:03 2012 @@ -19,26 +19,26 @@ hadoop dfs -rmr /testmf echo "creating first set of map files" -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -rfile /testmf/mf01 -timestamp 1 -size 50 -random 56 1000000 0 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -rfile /testmf/mf02 -timestamp 1 -size 50 -random 56 1000000 1000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -rfile /testmf/mf03 -timestamp 1 -size 50 -random 56 1000000 2000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -rfile /testmf/mf04 -timestamp 1 -size 50 -random 56 1000000 3000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -rfile /testmf/mf05 -timestamp 1 -size 50 -random 56 1000000 4000000 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile /testmf/mf01 --timestamp 1 --size 50 --random 56 --rows 1000000 --start 0 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile /testmf/mf02 --timestamp 1 --size 50 --random 56 --rows 1000000 --start 1000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile /testmf/mf03 --timestamp 1 --size 50 --random 56 --rows 1000000 --start 2000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile /testmf/mf04 --timestamp 1 --size 50 --random 56 --rows 1000000 --start 3000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile /testmf/mf05 --timestamp 1 --size 50 --random 56 --rows 1000000 --start 4000000 --cols 1 & wait echo "bulk importing" hadoop dfs -rmr /testmfFail -../../../bin/accumulo org.apache.accumulo.server.test.BulkImportDirectory root secret test_ingest /testmf /testmfFail +../../../bin/accumulo org.apache.accumulo.server.test.BulkImportDirectory -u root -p secret -t test_ingest -s /testmf -f /testmfFail echo "verifying" -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 0 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 1000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 2000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 3000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 1000000 4000000 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 0 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 1000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 2000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 3000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 1000000 --start 4000000 --cols 1 & wait @@ -46,24 +46,24 @@ hadoop dfs -rmr /testmf echo "creating second set of map files" -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -rfile /testmf/mf01 -timestamp 2 -size 50 -random 57 1000000 0 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -rfile /testmf/mf02 -timestamp 2 -size 50 -random 57 1000000 1000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -rfile /testmf/mf03 -timestamp 2 -size 50 -random 57 1000000 2000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -rfile /testmf/mf04 -timestamp 2 -size 50 -random 57 1000000 3000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.TestIngest -rfile /testmf/mf05 -timestamp 2 -size 50 -random 57 1000000 4000000 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile /testmf/mf01 --timestamp 2 --size 50 --random 57 --rows 1000000 --start 0 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile /testmf/mf02 --timestamp 2 --size 50 --random 57 --rows 1000000 --start 1000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile /testmf/mf03 --timestamp 2 --size 50 --random 57 --rows 1000000 --start 2000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile /testmf/mf04 --timestamp 2 --size 50 --random 57 --rows 1000000 --start 3000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile /testmf/mf05 --timestamp 2 --size 50 --random 57 --rows 1000000 --start 4000000 --cols 1 & wait echo "bulk importing" hadoop dfs -rmr /testmfFail -../../../bin/accumulo org.apache.accumulo.server.test.BulkImportDirectory root secret test_ingest /testmf /testmfFail +../../../bin/accumulo org.apache.accumulo.server.test.BulkImportDirectory -u root -p secret -t test_ingest -s /testmf -f /testmfFail echo "creating second set of map files" -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 0 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 1000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 2000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 3000000 1 & -../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 1000000 4000000 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 1000000 --start 0 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 1000000 --start 1000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 1000000 --start 2000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 1000000 --start 3000000 --cols 1 & +../../../bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 1000000 --start 4000000 --cols 1 & Modified: accumulo/trunk/test/system/upgrade_test.sh URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/upgrade_test.sh?rev=1423923&r1=1423922&r2=1423923&view=diff ============================================================================== --- accumulo/trunk/test/system/upgrade_test.sh (original) +++ accumulo/trunk/test/system/upgrade_test.sh Wed Dec 19 16:25:03 2012 @@ -38,10 +38,9 @@ hadoop fs -rmr /testmfFail echo "uptest\nsecret\nsecret" | $ONE_THREE_DIR/bin/accumulo init --clear-instance-name $ONE_THREE_DIR/bin/start-all.sh -$ONE_THREE_DIR/bin/accumulo 'org.apache.accumulo.server.test.TestIngest$CreateTable' 0 200000 10 root secret -$ONE_THREE_DIR/bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 1 -size 50 -random 56 100000 0 1 -$ONE_THREE_DIR/bin/accumulo org.apache.accumulo.server.test.TestIngest -mapFile /testmf/mf01 -timestamp 1 -size 50 -random 56 100000 100000 1 -$ONE_THREE_DIR/bin/accumulo org.apache.accumulo.server.test.BulkImportDirectory root secret test_ingest /testmf /testmfFail +$ONE_THREE_DIR/bin/accumulo org.apache.accumulo.server.test.TestIngest -u root -p secret --timestamp 1 --size 50 --random 56 --rows 100000 --start 0 --cols 1 +$ONE_THREE_DIR/bin/accumulo org.apache.accumulo.server.test.TestIngest --rfile /testmf/mf01 --timestamp 1 --size 50 --random 56 --rows 100000 --start 100000 --cols 1 +$ONE_THREE_DIR/bin/accumulo org.apache.accumulo.server.test.BulkImportDirectory -u root -p secret -t test_ingest --source /testmf --failures /testmfFail if [ $1 == "dirty" ]; then pkill -9 -f accumulo.start else @@ -55,27 +54,27 @@ echo "==== Starting 1.4 ===" #TODO test delete range $ONE_FOUR_DIR/bin/start-all.sh -$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 200000 0 1 +$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 200000 --start 0 --cols 1 echo "compact -t test_ingest -w" | $ONE_FOUR_DIR/bin/accumulo shell -u root -p secret -$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 200000 0 1 +$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 200000 --start 0 --cols 1 echo "merge -t test_ingest -s 1G" | $ONE_FOUR_DIR/bin/accumulo shell -u root -p secret -$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 200000 0 1 +$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 200000 --start 0 --cols 1 echo "clonetable test_ingest tmp\ndeletetable test_ingest\nrenametable tmp test_ingest" | $ONE_FOUR_DIR/bin/accumulo shell -u root -p secret -$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 1 -random 56 200000 0 1 +$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 1 --random 56 --rows 200000 --start 0 --cols 1 #test overwriting data writting in 1.3 -$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.TestIngest -timestamp 2 -size 50 -random 57 300000 0 1 -$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 300000 0 1 +$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.TestIngest --timestamp 2 --size 50 --random 57 --rows 300000 --start 0 --cols 1 +$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 300000 --start 0 --cols 1 echo "compact -t test_ingest -w" | $ONE_FOUR_DIR/bin/accumulo shell -u root -p secret -$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 300000 0 1 +$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 300000 --start 0 --cols 1 $ONE_FOUR_DIR/bin/stop-all.sh $ONE_FOUR_DIR/bin/start-all.sh -$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 300000 0 1 +$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 300000 --start 0 --cols 1 pkill -f accumulo.start $ONE_FOUR_DIR/bin/start-all.sh -$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest -size 50 -timestamp 2 -random 57 300000 0 1 +$ONE_FOUR_DIR/bin/accumulo org.apache.accumulo.server.test.VerifyIngest --size 50 --timestamp 2 --random 57 --rows 300000 --start 0 --cols 1 Modified: accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/MilliSpan.java URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/MilliSpan.java?rev=1423923&r1=1423922&r2=1423923&view=diff ============================================================================== --- accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/MilliSpan.java (original) +++ accumulo/trunk/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/MilliSpan.java Wed Dec 19 16:25:03 2012 @@ -110,6 +110,8 @@ public class MilliSpan implements Span { @Override public long traceId() { + if (parent == this) + throw new RuntimeException("loop found in trace!"); return parent.traceId(); }
