This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, trac-323-sos has been updated via f426c0145b6b4f0ecf0e1880f0b9ce2caf560269 (commit) from 07c0a2a6212329a063166742cd3f2a3048733c2c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f426c0145b6b4f0ecf0e1880f0b9ce2caf560269 Author: John Jenkins <[email protected]> Date: Mon Dec 22 12:51:23 2014 -0600 rm some misc. tosd code (configuration, debug) ----------------------------------------------------------------------- Summary of changes: code/src/common/triton-debug.spec | 1 - code/src/zeroconf/zeroconf.c | 49 ------------------------------------- code/tests/test-util.sh | 5 +--- 3 files changed, 1 insertions(+), 54 deletions(-) Diff of changes: diff --git a/code/src/common/triton-debug.spec b/code/src/common/triton-debug.spec index 5a40234..10d967c 100644 --- a/code/src/common/triton-debug.spec +++ b/code/src/common/triton-debug.spec @@ -23,7 +23,6 @@ 1 "info" "Informational messages" 0 "example" "Example debugging mask for testing purposes" 0 "example.subexample" "Example debugging mask with hierarchy for testing purposes" -0 "tosd" "Transactional OSD (server-side local storage component)" 0 "rosd" "Replicated OSD (server-side replicated storage component)" 0 "rosd.txncache" "Replicated OSD: transaction number cache" 0 "signal" "Signal handling resource" diff --git a/code/src/zeroconf/zeroconf.c b/code/src/zeroconf/zeroconf.c index c81d473..339aa61 100644 --- a/code/src/zeroconf/zeroconf.c +++ b/code/src/zeroconf/zeroconf.c @@ -40,55 +40,6 @@ struct zeroconf_entry zeroconf_array[] = "Debug mask to enable debugging of various triton components", NULL, }, - /* local storage options */ - { - CFG_STR("triton_tosd_discard_data", "no", CFGF_NONE), - "Should the TOSD discard data payloads? yes|no", - NULL, - }, - { - CFG_STR("triton_tosd_db_path", 0, CFGF_NONE), - "Directory that will contain Berkeley DB files used by the TOSD", - NULL, - }, - { - CFG_STR("triton_tosd_data_path", 0, CFGF_NONE), - "Directory that will contain raw data stored by the TOSD", - NULL, - }, - { - CFG_STR("triton_tosd_db_coalescing_highwater", "8", CFGF_NONE), - "Highwater mark for Berkeley DB coalescing", - NULL, - }, - { - CFG_STR("triton_tosd_data_coalescing_highwater", "8", CFGF_NONE), - "Highwater mark for data (fsync) coalescing", - NULL, - }, - { - CFG_STR("triton_tosd_alignment", "4096", CFGF_NONE), - "TOSD data on-disk data alignment (directio mode requires block alignment)", - NULL, - }, -#ifdef HAVE_ODIRECT - { - CFG_STR("triton_tosd_flags", "DATA_ODIRECT,DATA_SYNC", CFGF_NONE), - "TOSD initialization flags (DATA_ODIRECT for directio, DATA_SYNC for fsync)", - NULL, - }, -#else - { - CFG_STR("triton_tosd_flags", "DATA_SYNC", CFGF_NONE), - "TOSD initialization flags (DATA_SYNC for fsync)", - NULL, - }, -#endif - { - CFG_STR("triton_tosd_insert_errors_at_rate", "0", CFGF_NONE), - "Rate at which to inject storage errors, from 0.0 to 100.0", - NULL, - }, /* sos configuration parameters (TODO: grow) */ { CFG_STR("triton_sos_base_path", 0, CFGF_NONE), diff --git a/code/tests/test-util.sh b/code/tests/test-util.sh index 1a6b172..40ec7e9 100644 --- a/code/tests/test-util.sh +++ b/code/tests/test-util.sh @@ -40,11 +40,8 @@ function test_gen_conf () done echo "}" >> ${TMPBASE}/triton-$pid.conf echo "triton_debug_file = ${TMPBASE}/triton-server-%TRITON_SERVER_NAME%.log" >> ${TMPBASE}/triton-$pid.conf - echo "triton_tosd_db_path = ${TMPBASE}/triton-server-%TRITON_SERVER_NAME%-meta" >> ${TMPBASE}/triton-$pid.conf - echo "triton_tosd_data_path = ${TMPBASE}/triton-server-%TRITON_SERVER_NAME%-data" >> ${TMPBASE}/triton-$pid.conf echo "triton_sos_base_path = ${TMPBASE}/triton-server-%TRITON_SERVER_NAME%-sos" >> ${TMPBASE}/triton-$pid.conf echo "triton_debug_masks = \"all\"" >> ${TMPBASE}/triton-$pid.conf - echo "triton_tosd_flags = \"DATA_SYNC\"" >> ${TMPBASE}/triton-$pid.conf if [[ $repfactor -gt 0 ]] ; then echo "triton_rosd_default_replication_factor = $repfactor" \ >> ${TMPBASE}/triton-$pid.conf @@ -66,7 +63,7 @@ function test_start_servers () # start daemons for i in `seq $startport $endport` do - timeout --signal=9 ${maxtime} src/server/triton-server --conf ${TMPBASE}/triton-$pid.conf --listenaddr tcp://localhost:$i &> /dev/null & + timeout --signal=9 ${maxtime} src/server/triton-server --conf ${TMPBASE}/triton-$pid.conf --listenaddr tcp://localhost:$i &> ${TMPBASE}/triton-$pid.out & if [ $? -ne 0 ]; then exit 1 fi hooks/post-receive --