Author: gordonsim Date: 2008-06-12 17:28:35 -0400 (Thu, 12 Jun 2008) New Revision: 2150 Modified: store/trunk/cpp/lib/BdbMessageStore.cpp store/trunk/cpp/tests/system_test.sh Log: Remove store-async and store-force options Modified: store/trunk/cpp/lib/BdbMessageStore.cpp =================================================================== --- store/trunk/cpp/lib/BdbMessageStore.cpp 2008-06-10 21:10:49 UTC (rev 2149) +++ store/trunk/cpp/lib/BdbMessageStore.cpp 2008-06-12 21:28:35 UTC (rev 2150) @@ -1608,11 +1608,6 @@ ("store-directory", qpid::optValue(storeDir, "DIR"), "Store directory location for persistence (instead of using --data-dir value). " "Must be supplied if --no-data-dir is also used.") - ("store-async", qpid::optValue(storeAsync, "yes|no"), - "Use async persistence storage - if store supports it, enables AIO using O_DIRECT.") - ("store-force", qpid::optValue(storeForce, "yes|no"), - "Force changing modes of store (from sync to async or visa versa). " - "Will delete all existing data if mode is changed.") ("num-jfiles", qpid::optValue(numJrnlFiles, "N"), "Number of files in persistence journal") ("jfile-size-pgs", qpid::optValue(jrnlFsizePgs, "N"), Modified: store/trunk/cpp/tests/system_test.sh =================================================================== --- store/trunk/cpp/tests/system_test.sh 2008-06-10 21:10:49 UTC (rev 2149) +++ store/trunk/cpp/tests/system_test.sh 2008-06-12 21:28:35 UTC (rev 2150) @@ -44,7 +44,7 @@ fail=0 # Run the tests with a given set of flags -BROKER_OPTS="--no-module-dir --load-module=$LIBBDBSTORE --data-dir=$TMPDIR --auth=no --store-force=yes --wcache-page-size 16" +BROKER_OPTS="--no-module-dir --load-module=$LIBBDBSTORE --data-dir=$TMPDIR --auth=no --wcache-page-size 16" run_tests() { for p in `seq 1 8`; do $abs_srcdir/start_broker "$@" ${BROKER_OPTS} || return 1 @@ -54,8 +54,6 @@ } echo 'Journal (AIO) persistence...' -run_tests --store-async yes -echo 'BDB persistence...' -run_tests --store-async no +run_tests exit $fail