September 2014 - Triton-commits - mailman3.cels.anl.gov

branch, master, updated. a3b770a753048f5392b5bb46a662a4f68393340a
by noreply＠mcs.anl.gov 30 Sep '14

30 Sep '14

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, master has been updated via a3b770a753048f5392b5bb46a662a4f68393340a (commit) via 040203386f2751c756935fcb44b7774fce1cbfa9 (commit) from 229395c8d1cd2cec8d59bd48f121cff541760c6c (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 a3b770a753048f5392b5bb46a662a4f68393340a Author: John Jenkins <jenkins(a)mcs.anl.gov> Date: Tue Sep 30 22:01:59 2014 +0000 Patched up tests to not use O_DIRECT They almost always run on top of a tmpfs commit 040203386f2751c756935fcb44b7774fce1cbfa9 Author: John Jenkins <jenkins(a)mcs.anl.gov> Date: Tue Sep 30 22:01:35 2014 +0000 whoops, bad preprocessor conditional ----------------------------------------------------------------------- Summary of changes: code/src/transactional-osd/transactional-osd.ae | 3 +-- code/tests/test-util.sh | 2 +- code/tests/transactional-osd/tosd1.ae | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) Diff of changes: diff --git a/code/src/transactional-osd/transactional-osd.ae b/code/src/transactional-osd/transactional-osd.ae index 98ae6c6..c2bd537 100644 --- a/code/src/transactional-osd/transactional-osd.ae +++ b/code/src/transactional-osd/transactional-osd.ae @@ -3858,7 +3858,7 @@ static triton_ret_t flags_updater(const char *key, const char *value) tmp_value |= TOSD_INIT_FLAG_DATA_ODIRECT; } else -#else +#endif if(strcmp(parse_value, "DATA_SYNC") == 0) { tmp_value |= TOSD_INIT_FLAG_DATA_SYNC; @@ -3870,7 +3870,6 @@ static triton_ret_t flags_updater(const char *key, const char *value) "Error: invalid value %s for TOSD flags.", parse_value); return(TRITON_ERR_INVAL); } -#endif parse_value = next_value; } diff --git a/code/tests/test-util.sh b/code/tests/test-util.sh index 834039a..280df95 100644 --- a/code/tests/test-util.sh +++ b/code/tests/test-util.sh @@ -43,11 +43,11 @@ function test_gen_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_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 fi - } function test_start_servers () diff --git a/code/tests/transactional-osd/tosd1.ae b/code/tests/transactional-osd/tosd1.ae index 41bf1d1..8bd3e6e 100644 --- a/code/tests/transactional-osd/tosd1.ae +++ b/code/tests/transactional-osd/tosd1.ae @@ -649,6 +649,10 @@ __blocking int aesop_main(int argc, char **argv) triton_error_assert(ret); ret = triton_zeroconf_set("triton_tosd_data_path", data_path); triton_error_assert(ret); + /* note: need to disable O_DIRECT here since this test will be (likely) + * writing to a tmpfs */ + ret = triton_zeroconf_set("triton_tosd_flags", "DATA_SYNC"); + triton_error_assert(ret); ret = tosd_init(); if(ret != TRITON_SUCCESS) hooks/post-receive --

1 0

branch, master, updated. 229395c8d1cd2cec8d59bd48f121cff541760c6c
by noreply＠mcs.anl.gov 30 Sep '14

30 Sep '14

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, master has been updated via 229395c8d1cd2cec8d59bd48f121cff541760c6c (commit) from 150295b1b070bb4176201124c987cfec0547edf6 (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 229395c8d1cd2cec8d59bd48f121cff541760c6c Author: John Jenkins <jenkins(a)mcs.anl.gov> Date: Tue Sep 30 19:54:17 2014 +0000 conditional support for O_DIRECT - HAVE_ODIRECT was never defined, so TOSD was never using O_DIRECT - Alternatively, we could just assume it exists, in which case we get rid of the ifdefs entirely ----------------------------------------------------------------------- Summary of changes: code/configure.ac | 19 +++++++++++++++++++ code/src/transactional-osd/transactional-osd.ae | 23 ++++++++++++++++++++++- code/src/zeroconf/zeroconf.c | 8 ++++++++ 3 files changed, 49 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/configure.ac b/code/configure.ac index 233dc0d..ebd7bc5 100755 --- a/code/configure.ac +++ b/code/configure.ac @@ -84,6 +84,25 @@ AC_MSG_RESULT(no) AC_MSG_ERROR([Boost preprocessing not enabled in Mercury]) ) +# check for O_DIRECT +AC_MSG_CHECKING([for O_DIRECT]) +AC_TRY_COMPILE([ +#define _GNU_SOURCE +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> +], [ +int fd = open("check-for-o-direct.tmp", O_CREAT|O_WRONLY|O_DIRECT); +if (fd != -1) { close(fd); unlink("check-for-o-direct.tmp"); } +return fd == -1; +], +AC_MSG_RESULT(yes) +AC_DEFINE([HAVE_ODIRECT], [], [Define if able to open files with O_DIRECT]) +, +AC_MSG_RESULT(no) +AC_MSG_WARN([Unable to use O_DIRECT])) + dnl ==================================================== dnl Use pkgconfig to find c-utils dnl - Sets C_UTILS_CFLAGS, C_UTILS_LIBS diff --git a/code/src/transactional-osd/transactional-osd.ae b/code/src/transactional-osd/transactional-osd.ae index 329be2c..98ae6c6 100644 --- a/code/src/transactional-osd/transactional-osd.ae +++ b/code/src/transactional-osd/transactional-osd.ae @@ -1644,10 +1644,15 @@ triton_ret_t tosd_init(void) global_data_coalesce_highwater == global_db_coalesce_highwater); /* TODO: this should go to the logging api... */ +#ifdef HAVE_ODIRECT if(!(global_flags & TOSD_INIT_FLAG_DATA_ODIRECT) && !(global_flags & TOSD_INIT_FLAG_DATA_SYNC)) printf("WARNING: TOSD initialized without directio or fsync.\n"); if((global_flags & TOSD_INIT_FLAG_DATA_ODIRECT) && (global_alignment != 4096)) printf("WARNING: TOSD using directio, but alignment is not 4096.\n"); +#else + if(!(global_flags & TOSD_INIT_FLAG_DATA_SYNC)) + printf("WARNING: TOSD initialized without fsync.\n"); +#endif /* initialize required components */ ret = aesop_sem_module_init(); @@ -3847,11 +3852,14 @@ static triton_ret_t flags_updater(const char *key, const char *value) next_value++; } +#ifdef HAVE_ODIRECT if(strcmp(parse_value, "DATA_ODIRECT") == 0) { tmp_value |= TOSD_INIT_FLAG_DATA_ODIRECT; } - else if(strcmp(parse_value, "DATA_SYNC") == 0) + else +#else + if(strcmp(parse_value, "DATA_SYNC") == 0) { tmp_value |= TOSD_INIT_FLAG_DATA_SYNC; } @@ -3862,6 +3870,7 @@ static triton_ret_t flags_updater(const char *key, const char *value) "Error: invalid value %s for TOSD flags.", parse_value); return(TRITON_ERR_INVAL); } +#endif parse_value = next_value; } @@ -4146,7 +4155,11 @@ __blocking triton_ret_t tosd_autotune(void) } value = triton_zeroconf_get(flags_confkey); +#ifdef HAVE_ODIRECT if(strcmp(value, "DATA_ODIRECT,DATA_SYNC") != 0) +#else + if (strcmp(value, "DATA_SYNC") != 0) +#endif { fprintf(stderr, "Error: TOSD not using default DATA_ODIRECT,DATA_SYNC flags.\n"); return(TRITON_ERR_INVAL); @@ -4158,7 +4171,11 @@ __blocking triton_ret_t tosd_autotune(void) printf(" bdb txns: THREAD_PER_TXN\n"); printf(" bdb flushes: ONE_THREAD\n"); printf(" io: THREAD_POOL\n"); +#ifdef HAVE_ODIRECT printf(" tosd flags: DATA_ODIRECT,DATA_SYNC\n"); +#else + printf(" tosd flags: DATA_SYNC\n"); +#endif /* warm up run before real testing */ printf("tosd_autotune: metadata warm up run...\n"); @@ -4315,6 +4332,7 @@ __blocking triton_ret_t tosd_autotune(void) triton_error_assert(tret); } +#ifdef HAVE_ODIRECT /* turn off o_direct I/O */ tret = triton_zeroconf_set(flags_confkey, "DATA_SYNC"); triton_error_assert(tret); @@ -4344,6 +4362,7 @@ __blocking triton_ret_t tosd_autotune(void) flags_confkey, "DATA_ODIRECT,DATA_SYNC"); triton_error_assert(tret); } +#endif printf("SUGGESTED NON-DEFAULT ZEROCONF SETTINGS:\n"); printf("----------------------------------------\n"); @@ -4358,8 +4377,10 @@ __blocking triton_ret_t tosd_autotune(void) } if(wr2_tpo > wr2_default && wr2_tpo > wr2_no_threads) printf("triton_file_io_progress_mode=THREAD_PER_OP\n"); +#ifdef HAVE_ODIRECT if(wr2_no_odirect > wr2_default && wr2_no_odirect > wr2_no_threads) printf("triton_tosd_flags=DATA_SYNC"); +#endif /* TODO: other things we could consider testing later: * diff --git a/code/src/zeroconf/zeroconf.c b/code/src/zeroconf/zeroconf.c index dbd8583..f49abd0 100644 --- a/code/src/zeroconf/zeroconf.c +++ b/code/src/zeroconf/zeroconf.c @@ -71,11 +71,19 @@ struct zeroconf_entry zeroconf_array[] = "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", hooks/post-receive --

1 0

branch, master, updated. 150295b1b070bb4176201124c987cfec0547edf6
by noreply＠mcs.anl.gov 30 Sep '14

30 Sep '14

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, master has been updated via 150295b1b070bb4176201124c987cfec0547edf6 (commit) via 655f47b7f9336d75a31be9c7b592f85c83fc2e5c (commit) from 214578d0cd9102ed46923300a3a625b65bbb75f1 (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 150295b1b070bb4176201124c987cfec0547edf6 Author: John Jenkins <jenkins(a)mcs.anl.gov> Date: Tue Sep 30 15:34:56 2014 +0000 Added simple timing capability to mkdat utility commit 655f47b7f9336d75a31be9c7b592f85c83fc2e5c Author: John Jenkins <jenkins(a)mcs.anl.gov> Date: Thu Sep 25 19:59:25 2014 +0000 updates to use replication factor and not unique files hash function doesn't separate oids well enough ----------------------------------------------------------------------- Summary of changes: code/src/admin-tools/triton-mkdat.ae | 51 +++++++++++++++++++- .../ior-asg/example_input/ior_asg.conf.template | 6 +- misc/experiments/ior-asg/ior-run.sh | 19 +++++++- misc/experiments/ior-asg/run-tukey-example.sh | 1 + 4 files changed, 70 insertions(+), 7 deletions(-) Diff of changes: diff --git a/code/src/admin-tools/triton-mkdat.ae b/code/src/admin-tools/triton-mkdat.ae index 14d1fe0..3a082a8 100644 --- a/code/src/admin-tools/triton-mkdat.ae +++ b/code/src/admin-tools/triton-mkdat.ae @@ -2,6 +2,8 @@ #include <errno.h> #include <getopt.h> #include <stdlib.h> +#include <time.h> +#include <assert.h> #include <aesop/aesop.h> #include "src/zeroconf/zeroconf.h" @@ -35,7 +37,10 @@ static const char * usage_str = " -d, --object-dist DIST - distribution of object IDs.\n" " DIST expected to be one of \"seq\", <TODO: more dists>\n" " seq - OIDs assigned in increasing order (e.g., 1, 2, 3, ...)\n" -" (default - seq)"; +" (default - seq)\n" +" -t, --time - time write phase of program, printing to stdout\n" +" NOTE: timing is performed at object-granularity\n" +" NOTE: do not use with --fill - filling will be included in the time"; enum object_dist { SEQ, @@ -49,6 +54,7 @@ struct opt_vals{ int64_t size_per_write; int fill; enum object_dist dist; + int time_write; char * server; }; @@ -62,6 +68,7 @@ static const struct option long_opts[] = { {"size-per-record", required_argument, 0, 0}, {"record-fill", no_argument, 0, 0}, {"object-dist", required_argument, 0, 0}, + {"time", no_argument, 0, 0}, {NULL, 0, NULL, 0} }; @@ -74,6 +81,7 @@ static struct opt_vals opts = { 1, 0, SEQ, + 0, NULL }; @@ -132,6 +140,14 @@ __blocking int aesop_main(int argc, char **argv){ return 1; } + /* initialize times if necessary */ + double *times; + times = NULL; + struct timespec ts; + if (opts.time_write) { + assert((times = malloc(sizeof(double) * opts.num_objects))); + } + /* perform the writes */ int64_t obj, fork, write_nr; uint128_t oid; @@ -157,6 +173,11 @@ __blocking int aesop_main(int argc, char **argv){ triton_error_destroy(tret); return 1; } + + if (opts.time_write){ + clock_gettime(CLOCK_MONOTONIC, &ts); + times[obj-1] = (double) ts.tv_sec + 1e-9 * ts.tv_nsec; + } for (fork = 1; fork <= opts.num_forks; fork++){ for (write_nr = 0; write_nr < opts.writes_per_fork; write_nr++){ if (opts.fill){ @@ -182,10 +203,32 @@ __blocking int aesop_main(int argc, char **argv){ } } } + if (opts.time_write){ + clock_gettime(CLOCK_MONOTONIC, &ts); + times[obj-1] = (ts.tv_sec+1e-9*ts.tv_nsec) - times[obj-1]; + } } triton_mercury_engine_finalize(); + /* print out a timing summary */ + double avg; + int64_t bytes_per_object; + bytes_per_object = opts.num_forks * opts.writes_per_fork * + opts.size_per_write; + if (opts.time_write){ + avg = 0.0; + for (obj = 0; obj < opts.num_objects; obj++){ + avg += times[obj]; + } + avg /= opts.num_objects; + printf("%ld objects, %ld forks, %ld writes per fork, %ld size per write: " + "%ld bytes in %0.3le seconds, %0.2lf MB/s per object\n", + opts.num_objects, opts.num_forks, opts.writes_per_fork, + opts.size_per_write, bytes_per_object, avg, + (double)bytes_per_object / ((double)(1<<20)) / avg); + } + return 0; } aesop_main_set(aesop_main); @@ -225,7 +268,7 @@ static int parse_args(int argc, char **argv){ int ret; for (;;) { - c = getopt_long(argc, argv, "ho:r:f:w:s:Fd:", long_opts, &longindex); + c = getopt_long(argc, argv, "ho:r:f:w:s:Fd:t", long_opts, &longindex); if (c == -1) break; if (c == 0) { @@ -241,6 +284,7 @@ static int parse_args(int argc, char **argv){ case 6: c = 's'; break; case 7: c = 'F'; break; case 8: c = 'd'; break; + case 9: c = 't'; break; default: c = '?'; break; } } @@ -289,6 +333,9 @@ static int parse_args(int argc, char **argv){ return 1; } break; + case 't': + opts.time_write = 1; + break; case '?': fprintf(stderr, "unknown option, see -h | --help\n"); return 1; diff --git a/misc/experiments/ior-asg/example_input/ior_asg.conf.template b/misc/experiments/ior-asg/example_input/ior_asg.conf.template index 517357f..9ca69b3 100644 --- a/misc/experiments/ior-asg/example_input/ior_asg.conf.template +++ b/misc/experiments/ior-asg/example_input/ior_asg.conf.template @@ -7,10 +7,10 @@ IOR START transferSize=4M fsync=0 writeFile=1 - readFile=0 + readFile=1 keepFile=1 - filePerProc=1 - testFile = REPLACEME:uniq.dat + filePerProc=0 + testFile = REPLACEME:shared.dat useExistingTestFile=1 fsyncPerWrite=1 RUN diff --git a/misc/experiments/ior-asg/ior-run.sh b/misc/experiments/ior-asg/ior-run.sh index 3c879cf..87c28df 100755 --- a/misc/experiments/ior-asg/ior-run.sh +++ b/misc/experiments/ior-asg/ior-run.sh @@ -19,6 +19,7 @@ usage: $app [-h] [-e <path to triton executables>] [-p <ranks per node>] [-d <tempfile dir>] [-i <temp ID>] + [-r <replication factor>] <num clients> <host file> <template IOR config file> -h print this help message and exit @@ -41,6 +42,8 @@ usage: $app [-h] [-e <path to triton executables>] (default - current working directory) -i temporary ID to use with temp files (default - use the bash process ID) + -r replication factor for each object created + (default - 1) <num clients> number of IO client nodes <host file> file containing set of hosts <template file> IOR template to run. @@ -75,7 +78,8 @@ g_working_path=$(pwd) g_ior_exe= g_ior_ppn=1 g_temp_id=$$ -while getopts :he:m:c:s:x:p:t:i: flag ; do +g_repfactor=1 +while getopts :he:m:c:s:x:p:t:i:r: flag ; do case $flag in h) usage ;; @@ -95,6 +99,8 @@ while getopts :he:m:c:s:x:p:t:i: flag ; do ;; i) g_temp_id=$OPTARG ;; + r) g_repfactor=$OPTARG + ;; ?) echo Unrecognized option: $OPTARG esac done @@ -158,6 +164,14 @@ g_clifile_tmp=$g_working_path/clients.tmp.$g_temp_id head -n -$g_num_clients $g_host_file > $g_hostfile_tmp tail -n $g_num_clients $g_host_file > $g_clifile_tmp +### ensure the number of servers is large enough to support the replication +### factor +if [[ $(cat $g_hostfile_tmp | wc -l) -lt $g_repfactor ]] ; then + echo WARNING: \# hosts less than replication factor, downsizing replication factor \ + >&2 + g_repfactor=$(cat $g_hostfile_tmp | wc -l) +fi + # inject the processes per node into the client file # TODO: this is hydra-specific, may need to change for other scripts sed -ri "s/^.*\$/&:$g_ior_ppn/g" $g_clifile_tmp @@ -172,7 +186,8 @@ sed -ri "s/^.*\$/&:$g_ior_ppn/g" $g_clifile_tmp g_triton_cfg_file=$g_working_path/triton_ior.conf.$g_temp_id ${g_script_prefix}generate-config.sh \ - -f $g_hostfile_tmp $g_triton_template_arg $g_triton_storage_arg \ + -f $g_hostfile_tmp -r $g_repfactor \ + $g_triton_template_arg $g_triton_storage_arg \ > $g_triton_cfg_file assert_error diff --git a/misc/experiments/ior-asg/run-tukey-example.sh b/misc/experiments/ior-asg/run-tukey-example.sh index fa7f93f..9771b3e 100755 --- a/misc/experiments/ior-asg/run-tukey-example.sh +++ b/misc/experiments/ior-asg/run-tukey-example.sh @@ -36,6 +36,7 @@ $g_path_to_run/ior-run.sh \ -p 16 \ -t $g_tmp \ -i $COBALT_JOBID \ + -r 3 \ $1 \ $COBALT_NODEFILE \ $g_ior_cfg hooks/post-receive --

1 0

branch, master, updated. 09bd29408d1a1060e5f6b3b800e19d7c56a3a8d1
by noreply＠mcs.anl.gov 29 Sep '14

29 Sep '14

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, master has been updated via 09bd29408d1a1060e5f6b3b800e19d7c56a3a8d1 (commit) from aa4773bb7d018c916cc52bf8cb0ac3e842ca051b (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 09bd29408d1a1060e5f6b3b800e19d7c56a3a8d1 Author: John Jenkins <jenkins(a)mcs.anl.gov> Date: Mon Sep 29 08:29:13 2014 -0500 google trace analysis paper ----------------------------------------------------------------------- Summary of changes: notes/jenkins_related-data-analytics.pptx | Bin 3246536 -> 3252553 bytes 1 files changed, 0 insertions(+), 0 deletions(-) Diff of changes: diff --git a/notes/jenkins_related-data-analytics.pptx b/notes/jenkins_related-data-analytics.pptx index b9068b7..dbb8174 100644 Binary files a/notes/jenkins_related-data-analytics.pptx and b/notes/jenkins_related-data-analytics.pptx differ hooks/post-receive --

1 0

branch, master, updated. 214578d0cd9102ed46923300a3a625b65bbb75f1
by noreply＠mcs.anl.gov 25 Sep '14

25 Sep '14

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, master has been updated via 214578d0cd9102ed46923300a3a625b65bbb75f1 (commit) from 23442d64b3c80ec399436319dc7a44cd42b1011f (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 214578d0cd9102ed46923300a3a625b65bbb75f1 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Sep 25 17:07:03 2014 -0500 use --static with pkgconfig, remove openpa test - the --static argument is needed for pkgconfig to honor private library dependencies - the openpa test here was superfluous; thats only used within aesop and mercury ----------------------------------------------------------------------- Summary of changes: code/configure.ac | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) Diff of changes: diff --git a/code/configure.ac b/code/configure.ac index b80f109..233dc0d 100755 --- a/code/configure.ac +++ b/code/configure.ac @@ -38,6 +38,7 @@ dnl dnl Verify pkg-config dnl PKG_PROG_PKG_CONFIG +PKG_CONFIG="pkg-config --static" dnl dnl Use pkgconfig to find libconfuse @@ -94,16 +95,6 @@ CFLAGS="$C_UTILS_CFLAGS $CFLAGS" dnl unfortunately pkg-config doesn't separate cppflags/cflags CPPFLAGS="$C_UTILS_CPPFLAGS $CPPFLAGS" -AC_ARG_WITH([openpa], - [AS_HELP_STRING([[--with-openpa[=DIR]]], - [Installation path of OpenPA])], - [], - [ with_openpa="/usr" ]) -CFLAGS="$CFLAGS -I${with_openpa}/include" - -AC_CHECK_HEADER([opa_primitives.h],[], - [AC_MSG_ERROR([Could not find OpenPA header!])]) - CPPFLAGS="$CPPFLAGS -I$srcdir -I$srcdir/include -I. -D__TRITON_POSIX_LOCKING__" CFLAGS="$CFLAGS -I$srcdir -I$srcdir/include -I. -D__TRITON_POSIX_LOCKING__" hooks/post-receive --

1 0

Build failed in Jenkins: triton #27
by jenkins-ci＠mcs.anl.gov 25 Sep '14

25 Sep '14

See <https://jenkins-ci.mcs.anl.gov/job/triton/27/changes> Changes: [harms] Update test cases to each use a dedicate tmp folder. All tmp data should be in /tmp/tritontmp or in Jenkins /tritontmp ------------------------------------------ [...truncated 1465 lines...] # idx:3 node_id:::3346, virt_id:f0c2:9971:740d:5372:f27a:8feb:cd02:d80 # ring 41: # idx:0 node_id:::3345, virt_id:19ac:2504:18f1:2253:640a:5ed7:89c5:289a # idx:1 node_id:::3344, virt_id:7c4e:5b5e:6a0d:b5c5:8d5c:bd87:9af1:95b3 # idx:2 node_id:::3346, virt_id:a1cd:2cab:f613:68e5:bec8:a47c:f8ab:b28a # idx:3 node_id:::3347, virt_id:d200:c0ea:ca1b:228d:b14a:e9a1:8dd1:39ad # ring 42: # idx:0 node_id:::3346, virt_id:9b0:b677:2e52:4326:535b:c876:afc0:76d2 # idx:1 node_id:::3345, virt_id:1759:66cd:dd81:1f8c:6c79:c9db:1f7a:e94c # idx:2 node_id:::3344, virt_id:2b97:3f24:7d72:fe45:54a7:ea92:f221:e78f # idx:3 node_id:::3347, virt_id:982a:fc06:fef3:c7a6:f39f:fc0e:a79d:b351 # ring 43: # idx:0 node_id:::3346, virt_id:112b:b28e:3b2a:447a:4ecd:3a26:8627:bf9a # idx:1 node_id:::3345, virt_id:8ffe:7474:5717:e2ca:69ea:41ab:e211:a0e2 # idx:2 node_id:::3344, virt_id:a0f1:28d5:bd1e:c0c4:b648:a1d0:4d50:9e15 # idx:3 node_id:::3347, virt_id:a540:a429:30a9:cc2f:e808:b8c0:4c48:8a0a # ring 44: # idx:0 node_id:::3347, virt_id:1ded:877a:407b:faa6:5b7b:668d:5854:f677 # idx:1 node_id:::3344, virt_id:840a:4a22:f5f7:9e11:c8dd:9f93:ec78:26e8 # idx:2 node_id:::3346, virt_id:be31:af0f:5246:bc96:f21:9852:de81:118a # idx:3 node_id:::3345, virt_id:c1ef:6a73:10c7:afce:aa93:5604:474b:3a81 # ring 45: # idx:0 node_id:::3347, virt_id:9f58:6910:e761:6f60:6f8b:6dff:76e4:9a0 # idx:1 node_id:::3344, virt_id:b854:4a3c:aea:cea3:e678:3650:3834:34 # idx:2 node_id:::3345, virt_id:bc72:20a2:8673:ccaa:a2ea:b1f2:dab9:e07f # idx:3 node_id:::3346, virt_id:c36c:942c:cc69:73ac:a092:c76e:da97:a528 # ring 46: # idx:0 node_id:::3346, virt_id:4764:87d7:71cf:e546:b6bb:4995:4b00:b300 # idx:1 node_id:::3347, virt_id:4aac:4d9c:68f:dbac:7767:6b2a:2ca4:15d0 # idx:2 node_id:::3344, virt_id:ad9d:fa86:b6ea:25d4:debd:30b6:8f4c:8393 # idx:3 node_id:::3345, virt_id:d568:f866:f398:8c63:ba9d:f347:80b2:110e # ring 47: # idx:0 node_id:::3346, virt_id:6321:ef91:71e3:6985:630b:b18c:2dc2:101b # idx:1 node_id:::3345, virt_id:6db8:c87f:7e87:3833:5a6a:c016:9e37:c651 # idx:2 node_id:::3344, virt_id:ca12:30be:966a:f249:9c32:a82d:99e9:3bfd # idx:3 node_id:::3347, virt_id:e8d0:30bc:e88e:55fb:cf83:74c5:c7:27db # ring 48: # idx:0 node_id:::3346, virt_id:1ffe:1c79:4a88:5657:16e6:482a:1729:c857 # idx:1 node_id:::3344, virt_id:307d:92a0:403c:6c93:dfb4:d21b:572b:19c1 # idx:2 node_id:::3345, virt_id:31af:e183:a1f9:c4d3:c016:75d1:7357:47d3 # idx:3 node_id:::3347, virt_id:efab:9b9c:c35b:5d5e:bf12:a948:5563:8207 # ring 49: # idx:0 node_id:::3344, virt_id:5264:be20:239e:6e02:5cc2:b069:ecb5:5ace # idx:1 node_id:::3347, virt_id:81ad:610a:8e54:290c:4970:6c26:7036:c1d0 # idx:2 node_id:::3346, virt_id:d54e:d730:e4ff:d07:d531:d74:f243:c7c3 # idx:3 node_id:::3345, virt_id:ec30:10d:7cba:2fca:423d:85c3:fefa:4100 # ring 50: # idx:0 node_id:::3345, virt_id:65ed:3d4:861f:b48a:797c:2013:4a26:4367 # idx:1 node_id:::3346, virt_id:cc43:b9fc:a27d:8ac:7516:2a2e:89e4:b547 # idx:2 node_id:::3347, virt_id:e204:45b8:a05a:ed85:cea2:af09:b171:b43 # idx:3 node_id:::3344, virt_id:fd8d:9383:57da:17ad:5535:63fd:9006:a16 # ring 51: # idx:0 node_id:::3346, virt_id:3c60:f04b:c1a5:1624:df1:f0c:414c:848c # idx:1 node_id:::3345, virt_id:609f:b9cc:ee47:1de4:3c0a:afb8:651c:3a41 # idx:2 node_id:::3344, virt_id:86be:c60d:ac2d:ef7e:6ea8:50e8:1790:3069 # idx:3 node_id:::3347, virt_id:fb89:a8d5:f704:34d0:cf74:3206:9bd9:30a1 # ring 52: # idx:0 node_id:::3345, virt_id:1f25:68e6:479e:19cf:908e:e665:a862:9c89 # idx:1 node_id:::3347, virt_id:4aaf:c2ad:1799:26cb:64a0:d600:b4de:c1d0 # idx:2 node_id:::3344, virt_id:6d48:c159:2585:383d:33ce:e922:6b6:da1 # idx:3 node_id:::3346, virt_id:9662:73fe:5491:63bc:59f0:33ff:4cd3:ce93 # ring 53: # idx:0 node_id:::3346, virt_id:11b0:1d3:2a3:75a3:8171:fe1f:1996:ce28 # idx:1 node_id:::3347, virt_id:41a1:6f07:3df4:a1b7:f44d:64fe:7769:9b07 # idx:2 node_id:::3344, virt_id:4964:de1d:c1cb:47f0:6222:d154:628d:87f0 # idx:3 node_id:::3345, virt_id:5467:f42b:a5a:6b1a:8b0f:1d49:8cb3:acfc # ring 54: # idx:0 node_id:::3344, virt_id:e91:f217:cc4b:4ed6:fbd9:8e4a:14be:dca7 # idx:1 node_id:::3347, virt_id:2b22:2fa2:a699:1bb2:117c:853f:a56:1153 # idx:2 node_id:::3345, virt_id:341d:fb00:ff3:3354:2b80:e7fa:a4ea:fcc8 # idx:3 node_id:::3346, virt_id:43a9:f1d0:df33:6692:2d3a:d612:398a:74a6 # ring 55: # idx:0 node_id:::3345, virt_id:119:f46a:c040:119f:6256:93bf:c3d5:780e # idx:1 node_id:::3346, virt_id:680a:6d4e:1934:555c:babe:ad32:b1e8:cf66 # idx:2 node_id:::3347, virt_id:75ad:236:808b:1fc0:e07c:70c7:d2e1:37fb # idx:3 node_id:::3344, virt_id:fd3f:3ab0:ba81:c874:18a7:1c2a:1f11:cf93 # ring 56: # idx:0 node_id:::3346, virt_id:1710:f045:e1ba:78db:5ffb:8aa0:341:a980 # idx:1 node_id:::3345, virt_id:1d19:fd1d:808b:93b0:ff92:806e:bc41:3b98 # idx:2 node_id:::3344, virt_id:d4c0:7f2a:1ae:f9e1:2ef8:6225:733e:cede # idx:3 node_id:::3347, virt_id:fabe:d9e5:3b77:efd9:e03f:6474:1072:35ed # ring 57: # idx:0 node_id:::3347, virt_id:197b:605e:83b9:796c:2761:4ac3:5bab:8eb6 # idx:1 node_id:::3346, virt_id:9c57:bb5:5a47:59fd:7829:4368:4c6b:b162 # idx:2 node_id:::3345, virt_id:bdab:2a41:a673:dffc:623e:4893:2bab:6366 # idx:3 node_id:::3344, virt_id:cba8:8ba2:861d:cf70:b120:8d12:b759:6978 # ring 58: # idx:0 node_id:::3347, virt_id:45d:962f:d7ac:30e9:a39e:65b8:bad7:d44f # idx:1 node_id:::3345, virt_id:b8f:76c9:6b61:1d6c:109f:42d3:fc83:c9f0 # idx:2 node_id:::3344, virt_id:480a:ef66:5bee:5840:9f73:99e:fc87:8fb9 # idx:3 node_id:::3346, virt_id:97a6:b79a:26e1:69c4:d653:9149:7c56:e018 # ring 59: # idx:0 node_id:::3347, virt_id:4d76:ba39:79b4:7468:2d66:2171:42a0:8a85 # idx:1 node_id:::3344, virt_id:b639:aa85:8484:39c:5062:66a1:3118:8d74 # idx:2 node_id:::3346, virt_id:d635:e835:ea38:4bba:7a70:30c4:8fe3:22b0 # idx:3 node_id:::3345, virt_id:f85b:1272:b717:5808:e613:333b:cab4:5f73 # ring 60: # idx:0 node_id:::3347, virt_id:317b:ec62:5380:f924:44ad:a462:215c:b275 # idx:1 node_id:::3344, virt_id:59ed:5124:d223:c50c:ba1:3b68:ded5:218b # idx:2 node_id:::3346, virt_id:b25c:c1ea:ca66:c61e:f432:b0aa:80bc:9098 # idx:3 node_id:::3345, virt_id:d042:dfbf:4075:964e:e069:6ff5:ee9b:aa2a # ring 61: # idx:0 node_id:::3344, virt_id:44b:1132:2609:3639:98e7:4e80:5232:f759 # idx:1 node_id:::3345, virt_id:3c3d:5b99:185f:9ce2:4e7b:18f8:5888:9852 # idx:2 node_id:::3346, virt_id:4dbf:b379:2e38:9246:b60d:b9d3:f36f:8ba5 # idx:3 node_id:::3347, virt_id:bd89:50ec:c081:3346:91b4:ee6b:e5b0:c90a # ring 62: # idx:0 node_id:::3347, virt_id:6b5a:cbfb:520e:a2cc:1b36:ee73:7ec2:d998 # idx:1 node_id:::3344, virt_id:8252:7d3e:8a56:f8b:512a:3a4d:7324:92f1 # idx:2 node_id:::3346, virt_id:8bbc:75ce:f5e4:257c:17bb:c2fc:3973:da68 # idx:3 node_id:::3345, virt_id:b7e6:af63:610f:8d71:db91:3aaf:a979:8030 # ring 63: # idx:0 node_id:::3347, virt_id:15db:fee0:2bb5:8384:d66:411c:a111:f4b0 # idx:1 node_id:::3344, virt_id:9de2:7ce6:c4a8:9139:89bb:412a:c345:f3f7 # idx:2 node_id:::3346, virt_id:cbb3:b315:373a:d8eb:1fb2:f1fb:251e:6c0a # idx:3 node_id:::3345, virt_id:dcbb:6818:1199:7b87:1011:4bf6:70e4:136f # oid ::123 mapped to ring 35 # oid ::123 mapped 0 replica to node ::3344 # oid ::123 mapped 1 replica to node ::3347 # oid ::123 mapped 2 replica to node ::3345 PASS: tests/triton-show-placement.sh tmpbase: <https://jenkins-ci.mcs.anl.gov/job/triton/ws/tritontmp/test-QrSqD2> Server up and running Calling HG_Forward(). HG_ENCODE Finished HG_Forward(). Calling triton_mercury_wait(). Called mercury_rpc_enc_test_handler() Called mercury_rpc_enc_test Finished triton_mercury_wait(). HG_DECODE CONFIRMED request value of in.x == 6567223 CONFIRMED request value of in.nest.x == 99 CONFIRMED request value of in.nest.msg == "hello" CONFIRMED request values of in.array.x_array == [0,1,2] HG_FREE Server shutting down cleanly. Error in <https://jenkins-ci.mcs.anl.gov/job/triton/ws/build/depbuild/mercury/src/mer…>:628 (HG_Handler_finalize): Posted a request which did not complete. PASS: tests/mercury/mercury-enc.sh enosys example: base:Not implemented wrapped enosys example: :::stacked msg level 2, :::stacked msg level 1, :::stacked msg level 0, base:Not implemented PASS: tests/common/test-triton-ret-t all servers: ::1 ::3fff:ffff:ffff:ffff ::7fff:ffff:ffff:ffff ::bfff:ffff:ffff:fffd closest to OID: ::7fff:ffff:ffff:fffc: ::7fff:ffff:ffff:ffff ::bfff:ffff:ffff:fffd ::1 all servers: ::1 ::3fff:ffff:ffff:ffff ::7fff:ffff:ffff:ffff ::bfff:ffff:ffff:fffd closest to OID: ::bfff:ffff:ffff:fffa: ::bfff:ffff:ffff:fffd ::1 ::3fff:ffff:ffff:ffff PASS: tests/placement/test-placement-1d.sh all servers: ::1 ::3fff:ffff:ffff:ffff ::7fff:ffff:ffff:ffff ::bfff:ffff:ffff:fffd closest to OID: ::7fff:ffff:ffff:fffc: ::7fff:ffff:ffff:ffff ::bfff:ffff:ffff:fffd ::3fff:ffff:ffff:ffff all servers: ::1 ::3fff:ffff:ffff:ffff ::7fff:ffff:ffff:ffff ::bfff:ffff:ffff:fffd closest to OID: ::bfff:ffff:ffff:fffa: ::7fff:ffff:ffff:ffff ::3fff:ffff:ffff:ffff ::bfff:ffff:ffff:fffd PASS: tests/placement/test-placement-mrh.sh tmpbase: <https://jenkins-ci.mcs.anl.gov/job/triton/ws/tritontmp/test-EhQgCB> PASS: tests/common/test-debug.sh serialized: <::1><testkey><bar>,<::2><testkey><foo>,<::1><testkeyB><foo>,<::2><testkeyB><foo> node1 testkeyB value: foo node_list[0]: ::1 node_list[1]: ::2 PASS: tests/system-state/test-system-state + '[' -z <https://jenkins-ci.mcs.anl.gov/job/triton/ws/code> ']' + source <https://jenkins-ci.mcs.anl.gov/job/triton/ws/code/tests/test-util.sh> ++ '[' -n <https://jenkins-ci.mcs.anl.gov/job/triton/ws/> ']' ++ TMPDIR=<https://jenkins-ci.mcs.anl.gov/job/triton/ws/tritontmp> ++ export TMPDIR ++ mkdir -p <https://jenkins-ci.mcs.anl.gov/job/triton/ws/tritontmp> +++ mktemp --tmpdir -d test-XXXXXX ++ TMPBASE=<https://jenkins-ci.mcs.anl.gov/job/triton/ws/tritontmp/test-30fJv9> ++ echo 'tmpbase: <https://jenkins-ci.mcs.anl.gov/job/triton/ws/tritontmp/test-30fJv9'> tmpbase: <https://jenkins-ci.mcs.anl.gov/job/triton/ws/tritontmp/test-30fJv9> ++ '[' '!' -d <https://jenkins-ci.mcs.anl.gov/job/triton/ws/tritontmp/test-30fJv9> ']' + test_start_servers 1 5 60 + nservers=1 + startwait=5 + maxtime=60s + pid=6944 + startport=3344 ++ expr 3344 + 1 - 1 + endport=3344 + test_gen_conf + echo '# auto-generated configuration file from test pid 6944, 1 servers' + echo 'hosts = {' ++ seq 3344 3344 + for i in '`seq $startport $endport`' + echo -e '"::3344 tcp://localhost:3344",' + echo '}' + echo 'triton_debug_file = <https://jenkins-ci.mcs.anl.gov/job/triton/ws/tritontmp/test-30fJv9/triton-s…'> + echo 'triton_tosd_db_path = <https://jenkins-ci.mcs.anl.gov/job/triton/ws/tritontmp/test-30fJv9/triton-s…'> + echo 'triton_tosd_data_path = <https://jenkins-ci.mcs.anl.gov/job/triton/ws/tritontmp/test-30fJv9/triton-s…'> + echo 'triton_debug_masks = "all"' ++ seq 3344 3344 + for i in '`seq $startport $endport`' + '[' 0 -ne 0 ']' + sleep 5 + timeout --signal=9 60s src/server/triton-server --conf <https://jenkins-ci.mcs.anl.gov/job/triton/ws/tritontmp/test-30fJv9/triton-6…> --listenaddr tcp://localhost:3344 + svr1=tcp://localhost:3344 + run_to 60 tests/asg/test-asg-simple tcp://localhost:3344 555 + maxtime=60s + shift + timeout --signal=9 60s tests/asg/test-asg-simple tcp://localhost:3344 555 + '[' 0 -ne 0 ']' + run_to 60 src/admin-tools/triton-shutdown-all-servers tcp://localhost:3344 + wait + exit 0 PASS: tests/asg/test-asg-simple.sh ================================================================== 1 of 22 tests failed Please report to http://trac.mcs.anl.gov/projects/triton/newticket ================================================================== make[2]: *** [check-TESTS] Error 1 make[2]: Leaving directory `<https://jenkins-ci.mcs.anl.gov/job/triton/ws/build/tritonbuild'> make[1]: *** [check-am] Error 2 make[1]: Leaving directory `<https://jenkins-ci.mcs.anl.gov/job/triton/ws/build/tritonbuild'> make: *** [check] Error 2 Build step 'Execute shell' marked build as failure TAP Reports Processing: START Looking for TAP results report in workspace using pattern: build/tritonbuild/tests/results.tap Did not find any matching files.

1 15

branch, master, updated. 23442d64b3c80ec399436319dc7a44cd42b1011f
by noreply＠mcs.anl.gov 25 Sep '14

25 Sep '14

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, master has been updated via 23442d64b3c80ec399436319dc7a44cd42b1011f (commit) from f5ed0eb7854e90129b46562f4557d163cf9d86c9 (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 23442d64b3c80ec399436319dc7a44cd42b1011f Author: John Jenkins <jenkins(a)mcs.anl.gov> Date: Thu Sep 25 13:57:39 2014 -0500 probe_object fix for default rep factor + test (trac #319) ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/rosd-create.ae | 46 +++++++++----------- code/src/transactional-osd/transactional-osd.ae | 2 +- code/tests/Makefile.subdir | 1 + code/tests/triton-ls-object.sh | 52 +++++++++++++++++++++++ 4 files changed, 75 insertions(+), 26 deletions(-) create mode 100755 code/tests/triton-ls-object.sh Diff of changes: diff --git a/code/src/replicated-osd/rosd-create.ae b/code/src/replicated-osd/rosd-create.ae index e0638b5..442158a 100644 --- a/code/src/replicated-osd/rosd-create.ae +++ b/code/src/replicated-osd/rosd-create.ae @@ -286,35 +286,31 @@ static __blocking triton_ret_t rosd_create_local_storage( return triton_error_wrap(tret, self, "tosd_create failed"); } - if(replication_factor != rosd_default_replication_factor) + /* store replication factor directly in a data fork */ + obj_offset = 0; + buffer_offsets[0] = (char*)&replication_factor; + size = sizeof(replication_factor); + + /* NOTE: no need for tracking NIID for this portion of the operation. + * There is no harm in writing the replication factor twice. We do need + * to look out for conflicts on the transaction number, though. + */ + tret = tosd_write(oid, REP_FACTOR_FORK, 1, buffer_offsets, + &size, 1, &obj_offset, &size, 1, TOSD_FLAG_AUTO_TXN, 0, NULL); + if(tret != TRITON_SUCCESS) { - - /* store replication factor directly in a data fork */ - obj_offset = 0; - buffer_offsets[0] = (char*)&replication_factor; - size = sizeof(replication_factor); - - /* NOTE: no need for tracking NIID for this portion of the operation. - * There is no harm in writing the replication factor twice. We do need - * to look out for conflicts on the transaction number, though. + /* We created the object but weren't able to write its metadata. + * Give a best effort here to remove the object in order to simplify + * cleanup later. It's ok if this does not succeed. */ - tret = tosd_write(oid, REP_FACTOR_FORK, 1, buffer_offsets, - &size, 1, &obj_offset, &size, 1, TOSD_FLAG_AUTO_TXN, 0, NULL); - if(tret != TRITON_SUCCESS) + tret_tmp = tosd_remove(oid, 0); + if(tret_tmp != TRITON_SUCCESS) { - /* We created the object but weren't able to write its metadata. - * Give a best effort here to remove the object in order to simplify - * cleanup later. It's ok if this does not succeed. - */ - tret_tmp = tosd_remove(oid, 0); - if(tret_tmp != TRITON_SUCCESS) - { - triton_error_destroy(tret_tmp); - } - /* don't propagate tret_tmp to the caller; we want the caller to see - * the original error code instead, not side-effects from cleanup. - */ + triton_error_destroy(tret_tmp); } + /* don't propagate tret_tmp to the caller; we want the caller to see + * the original error code instead, not side-effects from cleanup. + */ } return(tret); diff --git a/code/src/transactional-osd/transactional-osd.ae b/code/src/transactional-osd/transactional-osd.ae index cefefdc..329be2c 100644 --- a/code/src/transactional-osd/transactional-osd.ae +++ b/code/src/transactional-osd/transactional-osd.ae @@ -4771,5 +4771,5 @@ __blocking triton_ret_t tosd_reset (uint128_t oid, * c-basic-offset: 4 * End: * - * vim: ts=8 sts=4 sw=4 expandtab + * vim: ft=c ts=8 sts=4 sw=4 expandtab */ diff --git a/code/tests/Makefile.subdir b/code/tests/Makefile.subdir index d75b6c2..4212fc6 100644 --- a/code/tests/Makefile.subdir +++ b/code/tests/Makefile.subdir @@ -28,6 +28,7 @@ TESTS += \ tests/triton-cp-big.sh \ tests/triton-ls.sh \ tests/triton-rm.sh \ + tests/triton-ls-object.sh \ tests/triton-show-system-state.sh \ tests/triton-show-config.sh \ tests/triton-show-debug-masks.sh \ diff --git a/code/tests/triton-ls-object.sh b/code/tests/triton-ls-object.sh new file mode 100755 index 0000000..03ce5e3 --- /dev/null +++ b/code/tests/triton-ls-object.sh @@ -0,0 +1,52 @@ +#!/bin/bash + +if [ -z $srcdir ]; then + echo srcdir variable not set. + exit 1 +fi +source $srcdir/tests/test-util.sh + +function tear_down () { + run_to 60 src/admin-tools/triton-shutdown-all-servers $svr1 &> /dev/null + rm -r \ + ${TMPBASE}/triton-server-*-data \ + ${TMPBASE}/triton-server-*-meta \ + ${TMPBASE}/triton-server-*.log +} + +num_servers=4 + +# start 4 servers with 15 second wait, 60s timeout +test_start_servers $num_servers 15 75 + +for ns in $(seq 1 $num_servers) ; do + run_to 60 src/admin-tools/triton-mkdat -r $ns -w 4 -s 2 $svr1 + if [[ $? -ne 0 ]] ; then + echo triton-mkdat unsuccessful >&2 ; tear_down ; wait ; exit 1 + fi + # test: run ls on the object, grab the fork/count/size + _tmp=($(run_to 60 src/admin-tools/triton-ls $svr1/::1 \ + | tail -n +2 | awk '{print $2;}')) + if [[ $? -ne 0 ]] ; then + echo triton-ls unsuccessful >&2 ; tear_down ; wait ; exit 1 + fi + # check output + if [[ ${_tmp[0]} != "::1" || ${_tmp[1]} -ne 4 || ${_tmp[2]} -ne 8 ]] ; then + echo "bad ls output (expected fork ::1, 4 records, size 8, got " \ + "${_tmp[0]}, ${_tmp[1]}, ${_tmp[2]}" >&2 + tear_down + wait ; exit 1 + fi + + # remove the data for the next iteration + run_to 60 src/admin-tools/triton-rm --server $svr1 ::1 + if [[ $? -ne 0 ]] ; then + echo unable to rm data >&2 ; tear_down ; wait ; exit 1 + fi +done + +# tear down +run_to 60 src/admin-tools/triton-shutdown-all-servers $svr1 &> /dev/null + +wait +exit 0 hooks/post-receive --

1 0

branch, master, updated. f5ed0eb7854e90129b46562f4557d163cf9d86c9
by noreply＠mcs.anl.gov 25 Sep '14

25 Sep '14

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, master has been updated via f5ed0eb7854e90129b46562f4557d163cf9d86c9 (commit) from 8e84e815c641d0fd01fee40d06df051ca645e51e (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 f5ed0eb7854e90129b46562f4557d163cf9d86c9 Author: Kevin Harms <harms(a)alcf.anl.gov> Date: Thu Sep 25 13:52:28 2014 -0500 show-system-state test is failing in jenkins. It might be that the client polls before the first server is up. Change to wait 5 seconds. We want to limit the wait so the test verifies the servers are not all started on the first poll. ----------------------------------------------------------------------- Summary of changes: code/tests/triton-show-system-state.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Diff of changes: diff --git a/code/tests/triton-show-system-state.sh b/code/tests/triton-show-system-state.sh index a35390c..fb021e4 100755 --- a/code/tests/triton-show-system-state.sh +++ b/code/tests/triton-show-system-state.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x if [ -z $srcdir ]; then echo srcdir variable not set. @@ -16,8 +16,8 @@ fi # Sleep duration in seconds if all servers are not up. number_of_seconds=13 -# start $number_of_servers with 1 second wait, 60s timeout -test_start_servers $number_of_servers 1 60 +# start $number_of_servers with 5 second wait, 60s timeout +test_start_servers $number_of_servers 5 60 pid=$$ hooks/post-receive --

1 0

branch, master, updated. 8e84e815c641d0fd01fee40d06df051ca645e51e
by noreply＠mcs.anl.gov 25 Sep '14

25 Sep '14

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, master has been updated via 8e84e815c641d0fd01fee40d06df051ca645e51e (commit) from 3ed215670ea20409e6bab053220deedc27b78e30 (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 8e84e815c641d0fd01fee40d06df051ca645e51e Author: John Jenkins <jenkins(a)mcs.anl.gov> Date: Thu Sep 25 10:41:00 2014 -0500 init default rep factor setting earlier in create call chain ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/rosd-create.ae | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) Diff of changes: diff --git a/code/src/replicated-osd/rosd-create.ae b/code/src/replicated-osd/rosd-create.ae index 1ef724c..e0638b5 100644 --- a/code/src/replicated-osd/rosd-create.ae +++ b/code/src/replicated-osd/rosd-create.ae @@ -48,6 +48,7 @@ static __blocking triton_ret_t triton_rpc_rosd_create(hg_handle_t handle) int got_addrs = 0; int i; na_addr_t next_addr; + uint32_t actual_rep_factor; triton_debug(triton_dbg_rosd, "Called triton_rpc_rosd_create()\n"); @@ -61,15 +62,19 @@ static __blocking triton_ret_t triton_rpc_rosd_create(hg_handle_t handle) out.tret = TRITON_SUCCESS; + /* replication_factor of 0 -> defer to system default */ + actual_rep_factor = (in.replication_factor) + ? in.replication_factor : rosd_default_replication_factor; + /* map oid to server addresses */ - addr_array = malloc(in.replication_factor*sizeof(*addr_array)); + addr_array = malloc(actual_rep_factor*sizeof(*addr_array)); if(!addr_array) { out.tret = TRITON_ERR_NOMEM; } if(!triton_is_error(out.tret)) { - out.tret = triton_oid_to_addrs(in.oid, in.replication_factor, &my_position, + out.tret = triton_oid_to_addrs(in.oid, actual_rep_factor, &my_position, addr_array); if(!triton_is_error(out.tret)) got_addrs = 1; @@ -83,17 +88,17 @@ static __blocking triton_ret_t triton_rpc_rosd_create(hg_handle_t handle) out.tret = TRITON_ERR_WRONG_SERVER; } } - if(my_position < (in.replication_factor-1)) + if(my_position < (actual_rep_factor-1)) { next_addr = addr_array[my_position+1]; } - out.tret = rosd_create_do_work(in.oid, in.flags, in.replication_factor, + out.tret = rosd_create_do_work(in.oid, in.flags, actual_rep_factor, my_position, next_addr, in.niid, 1); triton_mercury_start_output(handle, &out); - for(i=0; i<in.replication_factor && got_addrs; i++) + for(i=0; i<actual_rep_factor && got_addrs; i++) triton_mercury_addr_free(addr_array[i]); if(addr_array) free(addr_array); @@ -180,23 +185,18 @@ static __blocking triton_ret_t rosd_create_do_work( triton_ret_t local_tret; triton_ret_t remote_tret = TRITON_SUCCESS; triton_ret_t tret; - uint32_t actual_rep_factor; /* right now only chained replication is supported */ assert(!(flags & ROSD_FLAG_FANOUT)); flags |= ROSD_FLAG_CHAIN; - /* a 0 in replication_factor indicates deference to the default */ - actual_rep_factor = (replication_factor) ? - replication_factor : rosd_default_replication_factor; - /* forward request while simultaneously performing local work */ pwait { pprivate char* oid_str; pbranch { - if(my_position < actual_rep_factor -1) + if(my_position < replication_factor -1) { oid_str = triton_uint128_to_string(oid); triton_debug(triton_dbg_rosd, @@ -205,7 +205,7 @@ static __blocking triton_ret_t rosd_create_do_work( if (oid_str) free(oid_str); remote_tret = __remote_triton_rpc_rosd_create(next_addr, oid, - actual_rep_factor, flags, my_position+1); + replication_factor, flags, my_position+1); } } pbranch @@ -214,12 +214,12 @@ static __blocking triton_ret_t rosd_create_do_work( triton_debug(triton_dbg_rosd, "ROSD local create of oid %s on %d'th server.\n", oid_str, my_position); if (oid_str) free(oid_str); /* perform local operation */ - local_tret = rosd_create_local_storage(oid, actual_rep_factor, + local_tret = rosd_create_local_storage(oid, replication_factor, niid); } } - if(my_position < actual_rep_factor -1) + if(my_position < replication_factor -1) tret = interpret_errors(local_tret, remote_tret, my_position, is_usage_error_create, from_client_flag); else hooks/post-receive --

1 0

branch, master, updated. 3ed215670ea20409e6bab053220deedc27b78e30
by noreply＠mcs.anl.gov 24 Sep '14

24 Sep '14

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, master has been updated via 3ed215670ea20409e6bab053220deedc27b78e30 (commit) from 1331d3f05cdb3a2f1f60d8ae94c77cc409b2e8f5 (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 3ed215670ea20409e6bab053220deedc27b78e30 Author: John Jenkins <jenkins(a)mcs.anl.gov> Date: Wed Sep 24 13:50:23 2014 -0500 rep-factor configurable; default rf made more consistent via zeroconf option triton_rosd_default_replication_factor. asg_write and triton-cp now defer to the system default instead of using their own (asg's wasn't configurable to begin with). triton-touch requires a rep-factor argument - this may be made optional in the future ----------------------------------------------------------------------- Summary of changes: code/scripts/simple-mgmt/generate-config.sh | 9 ++++- code/src/admin-tools/triton-cp.ae | 2 +- code/src/admin-tools/triton-mkdat.ae | 47 +++++++++++++++++---------- code/src/asg/asg-internal.ae | 11 ++++++- code/src/replicated-osd/rosd-create.ae | 17 ++++++--- code/src/replicated-osd/rosd-internal.hae | 6 ++-- code/src/replicated-osd/rosd-remove.ae | 2 +- code/src/replicated-osd/rosd-write.ae | 2 +- code/src/replicated-osd/rosd.ae | 5 +++ code/src/replicated-osd/rosd.hae | 1 + code/src/zeroconf/zeroconf.c | 6 +++- code/tests/asg/test-asg-simple.sh | 4 +- code/tests/test-util.sh | 5 +++ 13 files changed, 83 insertions(+), 34 deletions(-) Diff of changes: diff --git a/code/scripts/simple-mgmt/generate-config.sh b/code/scripts/simple-mgmt/generate-config.sh index d944e8c..54635e0 100755 --- a/code/scripts/simple-mgmt/generate-config.sh +++ b/code/scripts/simple-mgmt/generate-config.sh @@ -35,6 +35,8 @@ usage: $app [-h] [-f <hostfile> ] [-p <protocol>] -s <directory> : Directory to place triton server data/metadata files in (expected to exist on each host) (default: /tmp) + -r <replication factor> : replication factor to use + (default: 1) This script generates a configuration file to standard out. EOF @@ -59,8 +61,10 @@ g_tdir=/tmp g_output= # directory of this script g_scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +# replication factor +g_repfactor=1 -while getopts :hf:p:c:n:m:s: flag; do +while getopts :hf:p:c:n:m:s:r: flag; do case $flag in h) usage ;; @@ -76,6 +80,8 @@ while getopts :hf:p:c:n:m:s: flag; do ;; s) g_tdir=$OPTARG ;; + r) g_repfactor=$OPTARG + ;; ?) echo "unknown parameter" usage ;; @@ -127,6 +133,7 @@ triton_debug_masks = $g_mask triton_debug_file = $g_tdir/triton-server-%TRITON_SERVER_NAME%-log triton_tosd_db_path = $g_tdir/triton-server-%TRITON_SERVER_NAME%-meta triton_tosd_data_path = $g_tdir/triton-server-%TRITON_SERVER_NAME%-data +triton_rosd_default_replication_factor = $g_repfactor EOF ) fi diff --git a/code/src/admin-tools/triton-cp.ae b/code/src/admin-tools/triton-cp.ae index 745c6cd..16c486b 100644 --- a/code/src/admin-tools/triton-cp.ae +++ b/code/src/admin-tools/triton-cp.ae @@ -50,7 +50,7 @@ static __blocking int tc_read(struct obj_ref* ref, char* buffer, int size); static __blocking int tc_write(struct obj_ref* ref, const char* buffer, int size); static __blocking int transfer(struct obj_ref *src, struct obj_ref *dest, char* buffer, int size); -int replication_factor = 1; +int replication_factor = 0; __blocking int aesop_main(int argc, char **argv) { diff --git a/code/src/admin-tools/triton-mkdat.ae b/code/src/admin-tools/triton-mkdat.ae index 82889e5..14d1fe0 100644 --- a/code/src/admin-tools/triton-mkdat.ae +++ b/code/src/admin-tools/triton-mkdat.ae @@ -19,6 +19,8 @@ static const char * usage_str = " -h, --help - print this message and exit\n" " -o, --num-objects N - create N objects\n" " (default - N=1)\n" +" -r, --replication-factor R - use a replication factor of R for each object\n" +" (default - R=1)\n" " -f, --num-forks F - create F forks per object\n" " (default - F=1)\n" " -w, --writes-per-fork W - perform W writes for each fork\n" @@ -41,6 +43,7 @@ enum object_dist { struct opt_vals{ int64_t num_objects; + uint32_t replication_factor; int64_t num_forks; int64_t writes_per_fork; int64_t size_per_write; @@ -50,14 +53,15 @@ struct opt_vals{ }; static const struct option long_opts[] = { - {"help", no_argument, 0, 0}, - {"num-objects", required_argument, 0, 0}, - {"num-forks", required_argument, 0, 0}, - {"num-records", required_argument, 0, 0}, - {"writes-per-fork", required_argument, 0, 0}, - {"size-per-record", required_argument, 0, 0}, - {"record-fill", no_argument, 0, 0}, - {"object-dist", required_argument, 0, 0}, + {"help", no_argument, 0, 0}, + {"num-objects", required_argument, 0, 0}, + {"replication-factor", required_argument, 0, 0}, + {"num-forks", required_argument, 0, 0}, + {"num-records", required_argument, 0, 0}, + {"writes-per-fork", required_argument, 0, 0}, + {"size-per-record", required_argument, 0, 0}, + {"record-fill", no_argument, 0, 0}, + {"object-dist", required_argument, 0, 0}, {NULL, 0, NULL, 0} }; @@ -67,6 +71,7 @@ static struct opt_vals opts = { 1, 1, 1, + 1, 0, SEQ, NULL @@ -138,8 +143,7 @@ __blocking int aesop_main(int argc, char **argv){ else { assert(0); } - /* create the object (TODO: promote replication factor to an opt */ - tret = remote_triton_rpc_rosd_create(oid, 1, 0); + tret = remote_triton_rpc_rosd_create(oid, opts.replication_factor, 0); if (triton_error_equal(tret, TRITON_ERR_EXIST)){ char * str = triton_uint128_to_string(oid); fprintf(stderr, "Object %s exists, need to delete manually for " @@ -221,7 +225,7 @@ static int parse_args(int argc, char **argv){ int ret; for (;;) { - c = getopt_long(argc, argv, "ho:f:w:s:Fd:", long_opts, &longindex); + c = getopt_long(argc, argv, "ho:r:f:w:s:Fd:", long_opts, &longindex); if (c == -1) break; if (c == 0) { @@ -230,12 +234,13 @@ static int parse_args(int argc, char **argv){ switch(longindex) { case 0: c = 'h'; break; case 1: c = 'o'; break; - case 2: c = 'f'; break; - case 3: c = 'r'; break; - case 4: c = 'w'; break; - case 5: c = 's'; break; - case 6: c = 'F'; break; - case 7: c = 'd'; break; + case 2: c = 'r'; break; + case 3: c = 'f'; break; + case 4: c = 'r'; break; + case 5: c = 'w'; break; + case 6: c = 's'; break; + case 7: c = 'F'; break; + case 8: c = 'd'; break; default: c = '?'; break; } } @@ -248,6 +253,14 @@ static int parse_args(int argc, char **argv){ ret = get_ll_suff("num-objects", optarg, &opts.num_objects); if (ret) return 1; break; + case 'r': ; + /* TODO: don't be lazy */ + int64_t tmp; + ret = get_ll_suff("replication-factor", optarg, + &tmp); + if (ret) return 1; + opts.replication_factor = (uint32_t) tmp; + break; case 'f': ret = get_ll_suff("num-forks", optarg, &opts.num_forks); if (ret) return 1; diff --git a/code/src/asg/asg-internal.ae b/code/src/asg/asg-internal.ae index ac70daf..59d05ab 100644 --- a/code/src/asg/asg-internal.ae +++ b/code/src/asg/asg-internal.ae @@ -101,7 +101,7 @@ __blocking int asg_i_write ( printf("data: %s, has %d lengh with new version: %ld with flag:%d\n", data, recordlen, (uint64_t)new_version, flags); */ - tret = remote_triton_rpc_rosd_create(oid, 1, 0); + tret = remote_triton_rpc_rosd_create(oid, 0, 0); if(triton_is_error(tret) && !triton_error_equal(TRITON_ERR_EXIST, tret)) { triton_error_print(tret, "remote_triton_rpc_rosd_create"); @@ -458,3 +458,12 @@ __blocking int asg_i_probe_fork ( return(rc); } + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * End: + * + * vim: ft=c ts=8 sts=4 sw=4 expandtab + */ diff --git a/code/src/replicated-osd/rosd-create.ae b/code/src/replicated-osd/rosd-create.ae index e8aab64..1ef724c 100644 --- a/code/src/replicated-osd/rosd-create.ae +++ b/code/src/replicated-osd/rosd-create.ae @@ -180,18 +180,23 @@ static __blocking triton_ret_t rosd_create_do_work( triton_ret_t local_tret; triton_ret_t remote_tret = TRITON_SUCCESS; triton_ret_t tret; + uint32_t actual_rep_factor; /* right now only chained replication is supported */ assert(!(flags & ROSD_FLAG_FANOUT)); flags |= ROSD_FLAG_CHAIN; + /* a 0 in replication_factor indicates deference to the default */ + actual_rep_factor = (replication_factor) ? + replication_factor : rosd_default_replication_factor; + /* forward request while simultaneously performing local work */ pwait { pprivate char* oid_str; pbranch { - if(my_position < replication_factor -1) + if(my_position < actual_rep_factor -1) { oid_str = triton_uint128_to_string(oid); triton_debug(triton_dbg_rosd, @@ -200,8 +205,7 @@ static __blocking triton_ret_t rosd_create_do_work( if (oid_str) free(oid_str); remote_tret = __remote_triton_rpc_rosd_create(next_addr, oid, - replication_factor, - flags, my_position+1); + actual_rep_factor, flags, my_position+1); } } pbranch @@ -210,11 +214,12 @@ static __blocking triton_ret_t rosd_create_do_work( triton_debug(triton_dbg_rosd, "ROSD local create of oid %s on %d'th server.\n", oid_str, my_position); if (oid_str) free(oid_str); /* perform local operation */ - local_tret = rosd_create_local_storage(oid, replication_factor, niid); + local_tret = rosd_create_local_storage(oid, actual_rep_factor, + niid); } } - if(my_position < replication_factor -1) + if(my_position < actual_rep_factor -1) tret = interpret_errors(local_tret, remote_tret, my_position, is_usage_error_create, from_client_flag); else @@ -281,7 +286,7 @@ static __blocking triton_ret_t rosd_create_local_storage( return triton_error_wrap(tret, self, "tosd_create failed"); } - if(replication_factor != DEFAULT_REPLICATION) + if(replication_factor != rosd_default_replication_factor) { /* store replication factor directly in a data fork */ diff --git a/code/src/replicated-osd/rosd-internal.hae b/code/src/replicated-osd/rosd-internal.hae index 07726aa..3c3068a 100644 --- a/code/src/replicated-osd/rosd-internal.hae +++ b/code/src/replicated-osd/rosd-internal.hae @@ -8,9 +8,9 @@ #include "src/replicated-osd/rosd.hae" -/* TODO: need a way to configure and/or reserve these values */ -/* default replication level for objects */ -#define DEFAULT_REPLICATION 3 +/* default replication level for objects (set via zeroconf) */ +extern uint32_t rosd_default_replication_factor; + /* default fork used to store replication factor in object */ #define REP_FACTOR_FORK UINT64_MAX diff --git a/code/src/replicated-osd/rosd-remove.ae b/code/src/replicated-osd/rosd-remove.ae index 45b10d6..21f6897 100644 --- a/code/src/replicated-osd/rosd-remove.ae +++ b/code/src/replicated-osd/rosd-remove.ae @@ -153,7 +153,7 @@ static __blocking triton_ret_t triton_rpc_rosd_remove(hg_handle_t handle) { if (out_size == 0) { - in.replication_factor = DEFAULT_REPLICATION; + in.replication_factor = rosd_default_replication_factor; } else { diff --git a/code/src/replicated-osd/rosd-write.ae b/code/src/replicated-osd/rosd-write.ae index a53529b..3cb0c34 100644 --- a/code/src/replicated-osd/rosd-write.ae +++ b/code/src/replicated-osd/rosd-write.ae @@ -364,7 +364,7 @@ static __blocking triton_ret_t triton_rpc_rosd_write(hg_handle_t handle) if(out_size != sizeof(in.replication_factor)) { assert(out_size == 0); - in.replication_factor = DEFAULT_REPLICATION; + in.replication_factor = rosd_default_replication_factor; } /* TODO: check flags to make sure this isn't an explicit conditional */ diff --git a/code/src/replicated-osd/rosd.ae b/code/src/replicated-osd/rosd.ae index 2f68f76..8137d81 100644 --- a/code/src/replicated-osd/rosd.ae +++ b/code/src/replicated-osd/rosd.ae @@ -28,6 +28,7 @@ static int64_t rosd_read_max_allocation = -1; static int64_t rosd_write_max_allocation = -1; static int64_t rosd_read_buffer_size = -1; static int64_t rosd_write_buffer_size = -1; +uint32_t rosd_default_replication_factor = -1; int64_t rosd_read_xfer_pipeline_depth = -1; int64_t rosd_write_xfer_pipeline_depth = -1; @@ -44,6 +45,8 @@ static triton_ret_t rosd_param_updater(const char* key, const char *value) if(ret != 1 || ival < 1) return(TRITON_ERR_INVAL); + if(!strcmp(key, "triton_rosd_default_replication_factor")) + rosd_default_replication_factor = (uint32_t) ival; if(!strcmp(key, "triton_rosd_read_buffer_size")) rosd_read_buffer_size = ival; else if(!strcmp(key, "triton_rosd_write_buffer_size")) @@ -71,6 +74,8 @@ triton_ret_t triton_rosd_svr_init(void) if(!module_refcount) { + triton_zeroconf_register_callback( + "triton_rosd_default_replication_factor", rosd_param_updater); triton_zeroconf_register_callback("triton_rosd_read_buffer_size", rosd_param_updater); triton_zeroconf_register_callback("triton_rosd_write_buffer_size", diff --git a/code/src/replicated-osd/rosd.hae b/code/src/replicated-osd/rosd.hae index 4fffa45..9bcf708 100644 --- a/code/src/replicated-osd/rosd.hae +++ b/code/src/replicated-osd/rosd.hae @@ -26,6 +26,7 @@ void triton_rosd_svr_finalize(void); void triton_rpc_rosd_register(void); +/* if replicas == 0, then use the system default replication factor */ __blocking triton_ret_t remote_triton_rpc_rosd_create( uint128_t oid, uint32_t replicas, diff --git a/code/src/zeroconf/zeroconf.c b/code/src/zeroconf/zeroconf.c index de38d06..dbd8583 100644 --- a/code/src/zeroconf/zeroconf.c +++ b/code/src/zeroconf/zeroconf.c @@ -94,6 +94,11 @@ struct zeroconf_entry zeroconf_array[] = }, /* ROSD */ { + CFG_STR("triton_rosd_default_replication_factor", "3", CFGF_NONE), + "Default object replication factor (1 -> no replication)", + NULL, + }, + { CFG_STR("triton_rosd_read_max_allocation", "536870912", CFGF_NONE), "Maximum memory to commit to ROSD read operations", NULL, @@ -123,7 +128,6 @@ struct zeroconf_entry zeroconf_array[] = "Maximum depth of per-operation write pipeline", NULL, }, - /* end sentinal; don't move this from final array position */ { CFG_END(), diff --git a/code/tests/asg/test-asg-simple.sh b/code/tests/asg/test-asg-simple.sh index 1857bf2..18af42f 100755 --- a/code/tests/asg/test-asg-simple.sh +++ b/code/tests/asg/test-asg-simple.sh @@ -6,8 +6,8 @@ if [ -z $srcdir ]; then fi source $srcdir/tests/test-util.sh -# start 1 server with 5 second wait, 60s timeout -test_start_servers 1 5 60 +# start 1 server with 5 second wait, 60s timeout, rep factor 1 +test_start_servers 1 5 60 1 # actual test case ##################### diff --git a/code/tests/test-util.sh b/code/tests/test-util.sh index a9a201c..834039a 100644 --- a/code/tests/test-util.sh +++ b/code/tests/test-util.sh @@ -43,6 +43,10 @@ function test_gen_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_debug_masks = \"all\"" >> ${TMPBASE}/triton-$pid.conf + if [[ $repfactor -gt 0 ]] ; then + echo "triton_rosd_default_replication_factor = $repfactor" \ + >> ${TMPBASE}/triton-$pid.conf + fi } @@ -51,6 +55,7 @@ function test_start_servers () nservers=${1:-4} startwait=${2:-15} maxtime=${3:-120}s + repfactor=${4:-0} pid=$$ startport=3344 endport=`expr 3344 + $nservers - 1` hooks/post-receive --

1 0