Modified: accumulo/branches/ACCUMULO-259/test/system/continuous/start-walkers.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/continuous/start-walkers.sh?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/test/system/continuous/start-walkers.sh (original) +++ accumulo/branches/ACCUMULO-259/test/system/continuous/start-walkers.sh Mon Jan 14 22:03:24 2013 @@ -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 --table $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/branches/ACCUMULO-259/test/system/randomwalk/bin/start-local.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/randomwalk/bin/start-local.sh?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/test/system/randomwalk/bin/start-local.sh (original) +++ accumulo/branches/ACCUMULO-259/test/system/randomwalk/bin/start-local.sh Mon Jan 14 22:03:24 2013 @@ -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/branches/ACCUMULO-259/test/system/test1/ingest_test.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/test1/ingest_test.sh?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/test/system/test1/ingest_test.sh (original) +++ accumulo/branches/ACCUMULO-259/test/system/test1/ingest_test.sh Mon Jan 14 22:03:24 2013 @@ -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/branches/ACCUMULO-259/test/system/test1/ingest_test_2.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/test1/ingest_test_2.sh?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/test/system/test1/ingest_test_2.sh (original) +++ accumulo/branches/ACCUMULO-259/test/system/test1/ingest_test_2.sh Mon Jan 14 22:03:24 2013 @@ -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/branches/ACCUMULO-259/test/system/test1/verify_test.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/test1/verify_test.sh?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/test/system/test1/verify_test.sh (original) +++ accumulo/branches/ACCUMULO-259/test/system/test1/verify_test.sh Mon Jan 14 22:03:24 2013 @@ -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/branches/ACCUMULO-259/test/system/test1/verify_test_2.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/test1/verify_test_2.sh?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/test/system/test1/verify_test_2.sh (original) +++ accumulo/branches/ACCUMULO-259/test/system/test1/verify_test_2.sh Mon Jan 14 22:03:24 2013 @@ -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/branches/ACCUMULO-259/test/system/test2/concurrent.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/test2/concurrent.sh?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/test/system/test2/concurrent.sh (original) +++ accumulo/branches/ACCUMULO-259/test/system/test2/concurrent.sh Mon Jan 14 22:03:24 2013 @@ -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/branches/ACCUMULO-259/test/system/test3/bigrow.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/test3/bigrow.sh?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/test/system/test3/bigrow.sh (original) +++ accumulo/branches/ACCUMULO-259/test/system/test3/bigrow.sh Mon Jan 14 22:03:24 2013 @@ -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/branches/ACCUMULO-259/test/system/test4/bulk_import_test.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/test4/bulk_import_test.sh?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/test/system/test4/bulk_import_test.sh (original) +++ accumulo/branches/ACCUMULO-259/test/system/test4/bulk_import_test.sh Mon Jan 14 22:03:24 2013 @@ -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/branches/ACCUMULO-259/test/system/upgrade_test.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/upgrade_test.sh?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/test/system/upgrade_test.sh (original) +++ accumulo/branches/ACCUMULO-259/test/system/upgrade_test.sh Mon Jan 14 22:03:24 2013 @@ -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 Propchange: accumulo/branches/ACCUMULO-259/trace/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Jan 14 22:03:24 2013 @@ -1,7 +1,5 @@ target - .classpath - .project - .settings +cloudtrace.iml Modified: accumulo/branches/ACCUMULO-259/trace/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/trace/pom.xml?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/trace/pom.xml (original) +++ accumulo/branches/ACCUMULO-259/trace/pom.xml Mon Jan 14 22:03:24 2013 @@ -37,6 +37,24 @@ </plugin> </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-core-thrift</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>${basedir}/src/main/scripts/generate-thrift.sh</executable> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> <dependencies> @@ -52,7 +70,7 @@ <dependency> - <groupId>org.apache.hadoop</groupId> + <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> </dependency> <dependency> Modified: accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/MilliSpan.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/MilliSpan.java?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/MilliSpan.java (original) +++ accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/MilliSpan.java Mon Jan 14 22:03:24 2013 @@ -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(); } Modified: accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/AsyncSpanReceiver.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/AsyncSpanReceiver.java?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/AsyncSpanReceiver.java (original) +++ accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/AsyncSpanReceiver.java Mon Jan 14 22:03:24 2013 @@ -51,7 +51,7 @@ public abstract class AsyncSpanReceiver< protected abstract SpanKey getSpanKey(Map<String,String> data); Timer timer = new Timer("SpanSender", true); - AbstractQueue<RemoteSpan> sendQueue = new ConcurrentLinkedQueue<RemoteSpan>(); + final AbstractQueue<RemoteSpan> sendQueue = new ConcurrentLinkedQueue<RemoteSpan>(); public AsyncSpanReceiver(String host, String service, long millis) { this.host = host; Modified: accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java (original) +++ accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java Mon Jan 14 22:03:24 2013 @@ -52,7 +52,11 @@ public class TraceWrap { @Override public Object invoke(Object obj, Method method, Object[] args) throws Throwable { if (args == null || args.length < 1 || args[0] == null || !(args[0] instanceof TInfo)) { - return method.invoke(instance, args); + try { + return method.invoke(instance, args); + } catch (InvocationTargetException ex) { + throw ex.getCause(); + } } Span span = Trace.trace((TInfo) args[0], method.getName()); try { Modified: accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java (original) +++ accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java Mon Jan 14 22:03:24 2013 @@ -1,3 +1,19 @@ +/* + * 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. + */ /** * Autogenerated by Thrift Compiler (0.9.0) * @@ -1013,7 +1029,7 @@ import org.slf4j.LoggerFactory; for (int _i1 = 0; _i1 < _map0.size; ++_i1) { String _key2; // required - String _val3; // required + String _val3; // optional _key2 = iprot.readString(); _val3 = iprot.readString(); struct.data.put(_key2, _val3); @@ -1208,7 +1224,7 @@ import org.slf4j.LoggerFactory; for (int _i7 = 0; _i7 < _map6.size; ++_i7) { String _key8; // required - String _val9; // required + String _val9; // optional _key8 = iprot.readString(); _val9 = iprot.readString(); struct.data.put(_key8, _val9); Modified: accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java (original) +++ accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java Mon Jan 14 22:03:24 2013 @@ -1,3 +1,19 @@ +/* + * 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. + */ /** * Autogenerated by Thrift Compiler (0.9.0) * Modified: accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java (original) +++ accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java Mon Jan 14 22:03:24 2013 @@ -1,3 +1,19 @@ +/* + * 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. + */ /** * Autogenerated by Thrift Compiler (0.9.0) * Modified: accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java (original) +++ accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java Mon Jan 14 22:03:24 2013 @@ -1,3 +1,19 @@ +/* + * 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. + */ /** * Autogenerated by Thrift Compiler (0.9.0) * Modified: accumulo/branches/ACCUMULO-259/trace/src/main/thrift/cloudtrace.thrift URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/trace/src/main/thrift/cloudtrace.thrift?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/trace/src/main/thrift/cloudtrace.thrift (original) +++ accumulo/branches/ACCUMULO-259/trace/src/main/thrift/cloudtrace.thrift Mon Jan 14 22:03:24 2013 @@ -15,6 +15,7 @@ * limitations under the License. */ namespace java org.apache.accumulo.cloudtrace.thrift +namespace cpp org.apache.accumulo.cloudtrace.thrift struct RemoteSpan { 1:string sender, Modified: accumulo/branches/ACCUMULO-259/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/CountSamplerTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/CountSamplerTest.java?rev=1433166&r1=1433165&r2=1433166&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/CountSamplerTest.java (original) +++ accumulo/branches/ACCUMULO-259/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/CountSamplerTest.java Mon Jan 14 22:03:24 2013 @@ -16,7 +16,7 @@ */ package org.apache.accumulo.cloudtrace.instrument; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.accumulo.cloudtrace.instrument.CountSampler; import org.junit.Test;
