May 2011 - Triton-commits - mailman3.cels.anl.gov

Triton Repository branch, master, updated. d081a8fe850bb42e495eb8e63e821dc9be2d95af
by noreply＠mcs.anl.gov 18 May '11

18 May '11

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 "Triton Repository". The branch, master has been updated via d081a8fe850bb42e495eb8e63e821dc9be2d95af (commit) from 6ac421f68d9dcde9cf445bb36995efc1eacb26be (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 d081a8fe850bb42e495eb8e63e821dc9be2d95af Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed May 18 17:29:31 2011 -0400 bug fix for triton_buffer_t corruption in rpcs - This patch inverts the ae_ctl_done() and __ae_local_cb() calls in the generated code from aesop. It seems to eliminate the rosd/kv/remote bug indicated by valgrind on remote_rosd_read() calls, and doesn't introduce any new leaks or errors in rosd-create-bench tests. - fixes #126 ----------------------------------------------------------------------- Summary of changes: code/src/aesop/ae-blocking-parser.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) Diff of changes: diff --git a/code/src/aesop/ae-blocking-parser.h b/code/src/aesop/ae-blocking-parser.h index ea33201..90db87a 100644 --- a/code/src/aesop/ae-blocking-parser.h +++ b/code/src/aesop/ae-blocking-parser.h @@ -100,8 +100,8 @@ static void __bfun##_##__fname##_##__pos_str##_callback(void *__ae_ptr, __cb_ret \ AE_MK_END_OF_BLOCKING(__bfun, ""); \ ae_debug_pbranch("ctl_done: cb: fn_complete: %p\n", __ae_ctl); \ - ae_ctl_done(&__ae_ctl->gen); \ __ae_local_cb(__ae_local_up, __ae_ret); \ + ae_ctl_done(&__ae_ctl->gen); \ } \ \ return; \ @@ -123,8 +123,8 @@ static void __bfun##_##__fname##_##__pos_str##_callback(void *__ae_ptr, __cb_ret \ AE_MK_END_OF_BLOCKING(__bfun, ""); \ ae_debug_pbranch("ctl_done: cb: fn_complete: %p\n", __ae_ctl); \ - ae_ctl_done(&__ae_ctl->gen); \ __ae_local_cb(__ae_local_up); \ + ae_ctl_done(&__ae_ctl->gen); \ } \ \ return; \ @@ -145,8 +145,8 @@ static void __bfun##_##__fname##_##__pos_str##_callback(void *__ae_ptr) \ \ AE_MK_END_OF_BLOCKING(__bfun, ""); \ ae_debug_pbranch("ctl_done: cb: fn_complete: %p\n", __ae_ctl); \ - ae_ctl_done(&__ae_ctl->gen); \ __ae_local_cb(__ae_local_up, __ae_ret); \ + ae_ctl_done(&__ae_ctl->gen); \ } \ \ return; \ @@ -166,8 +166,8 @@ static void __bfun##_##__fname##_##__pos_str##_callback(void *__ae_ptr) \ \ AE_MK_END_OF_BLOCKING(__bfun, ""); \ ae_debug_pbranch("ctl_done: cb: fn_complete: %p\n", __ae_ctl); \ - ae_ctl_done(&__ae_ctl->gen); \ __ae_local_cb(__ae_local_up); \ + ae_ctl_done(&__ae_ctl->gen); \ } \ \ return; \ @@ -574,8 +574,8 @@ __ae_pbranch_##__pbranch_pos_str##_after: {} { \ __ret_type __ae_local_retval = __ae_ctl->return_value; \ ae_debug_pbranch("ctl_done: bfun ic: %p\n", __ae_ctl); \ - ae_ctl_done(&__ae_ctl->gen); \ __ae_local_cb(__ae_local_up, __ae_local_retval); \ + ae_ctl_done(&__ae_ctl->gen); \ } \ } \ return __ae_myret; hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 6ac421f68d9dcde9cf445bb36995efc1eacb26be
by noreply＠mcs.anl.gov 18 May '11

18 May '11

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 "Triton Repository". The branch, master has been updated via 6ac421f68d9dcde9cf445bb36995efc1eacb26be (commit) from cb53720e4fdb4a5df72cb55ec8cb4e70b3b50009 (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 6ac421f68d9dcde9cf445bb36995efc1eacb26be Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed May 18 14:03:40 2011 -0400 test program for triton_buffer double free - this replicates the problem seen in kvtest and rosd-create-bench in a simpler setting for debugging ref #126 #58 ----------------------------------------------------------------------- Summary of changes: code/src/aesop/parser/tests/remote/module.mk.in | 15 +++- .../tests/remote/test-remote-buffer-response.aer | 110 ++++++++++++++++++++ 2 files changed, 124 insertions(+), 1 deletions(-) create mode 100644 code/src/aesop/parser/tests/remote/test-remote-buffer-response.aer Diff of changes: diff --git a/code/src/aesop/parser/tests/remote/module.mk.in b/code/src/aesop/parser/tests/remote/module.mk.in index 08272b7..cd75523 100644 --- a/code/src/aesop/parser/tests/remote/module.mk.in +++ b/code/src/aesop/parser/tests/remote/module.mk.in @@ -66,11 +66,24 @@ $(FULLMODNAME5).d: $(DIR_TESTREMOTE)/test-remote-service-stop.aer $(Q) " DEP $@" $(E)CC=$(call MCC_AE,$(FULLMODNAME5)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME5) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME5) $< > $@ +REMOTE_TESTLIB_MODULES += $(DIR_TESTREMOTE)/test_remote_buffer_response +REMOTE_MODSRC_$(DIR_TESTREMOTE)/test_remote_buffer_response := $(DIR_TESTREMOTE)/test-remote-buffer-response.aer +MODNAME5 := test_remote_buffer_response +FULLMODNAME5 := $(DIR_TESTREMOTE)/$(MODNAME5) + +$(FULLMODNAME5)_stubs.hae $(FULLMODNAME5)_module.h $(FULLMODNAME5)_module.o $(DIR_TESTREMOTE)/test-remote-buffer-response.o: $(FULLMODNAME5).dummy + +$(FULLMODNAME5).d: $(DIR_TESTREMOTE)/test-remote-buffer-response.aer + $(Q) " DEP $@" + $(E)CC=$(call MCC_AE,$(FULLMODNAME5)) $(srcdir)/maint/depend-aer.sh $(DIR_TESTREMOTE) $(MODNAME5) $(LIBCFLAGS) $(CFLAGS) $(call MODCFLAGS_AE,$FULLMODNAME5) $< > $@ + + REMOTE_TESTSRC += $(DIR_TESTREMOTE)/test-remote-mock.aer \ $(DIR_TESTREMOTE)/test-remote-mock-embedded-buffers.aer \ $(DIR_TESTREMOTE)/test-remote-mpi.aer \ $(DIR_TESTREMOTE)/test-remote-fault-injector.aer \ - $(DIR_TESTREMOTE)/test-remote-service-stop.aer + $(DIR_TESTREMOTE)/test-remote-service-stop.aer \ + $(DIR_TESTREMOTE)/test-remote-buffer-response.aer endif # BUILD_MPI diff --git a/code/src/aesop/parser/tests/remote/test-remote-buffer-response.aer b/code/src/aesop/parser/tests/remote/test-remote-buffer-response.aer new file mode 100644 index 0000000..d9c9e2b --- /dev/null +++ b/code/src/aesop/parser/tests/remote/test-remote-buffer-response.aer @@ -0,0 +1,110 @@ +#include <unistd.h> + +#include "src/common/triton-types.h" +#include "src/aesop/hints.h" +#include "src/aesop/aesop.h" +#include "src/remote/encoding.h" +#include "src/remote/remote.hae" +#include "src/net/triton-message.hae" +#include "src/net/triton-message-method.hae" +#include "src/net/mock/mock-method.h" +#include "src/common/resources/scheduling/sched.hae" +#include "src/common/resources/timer/timer.hae" +#include "src/zeroconf/zeroconf.h" +#include "src/net/mpi/mpi.hae" +#include "src/net/mpi/mpi-method.h" + +#include "src/remote/service.hae" +#include "src/common/triton-init.h" + + +/* normally you don't have to declare this, but we do here because + * it gets declared in <module>_module.h (myclientserver_module.h) + * which is generated by this source file. + */ +triton_ret_t aer_remote_register_test_remote_buffer_response(void); + +#include "mpi.h" + +__remote struct test_resp +{ + triton_buffer_t buffer; +}; + +__remote __blocking triton_ret_t buffer_maker(int32_t in, struct test_resp *resp); + +__remote __blocking triton_ret_t buffer_maker(int32_t in, struct test_resp *resp) +{ + triton_ret_t tret; + + /* just allocate an empty buffer to send in the response */ + tret = triton_buffer_alloc(&resp->buffer, 10); + + return(tret); +} + +__blocking void do_remote_test(aer_remote_ctx_t rctx) +{ + triton_ret_t ret; + int32_t result; + int rank; + triton_addr_t addr; + char addr_str[256]; + struct test_resp resp; + + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + + if(rank == 0) + { + /* need a good way to wait for all the processes, so that + * we know the aer_service_requests calls have been started + * and will be able to receive messages. For now, we just sleep + * for a sec. + */ + ret = triton_timer(1000); + triton_error_assert(ret); + + sprintf(addr_str, "mpi://1"); + + ret = triton_addr_lookup(addr_str, &addr); + triton_error_assert(ret); + + ret = remote_buffer_maker(rctx, addr, 0, &resp); + triton_error_assert(ret); + + if(ret == TRITON_SUCCESS) + { + aer_destroy_struct_test_resp(&resp); + } + } + else + { + /* service a single request */ + assert(rctx != NULL); + ret = aer_service_requests(rctx, 1); + } +} + +__blocking int aesop_main(int argc, char **argv) +{ + triton_ret_t ret; + ae_op_id_t op_id; + + ret = aer_remote_register_test_remote_buffer_response(); + triton_error_assert(ret); + + do_remote_test(AER_DEFAULT_CTX); + + return 0; +} +aesop_main_set_with_init(NULL, "triton.client", aesop_main, "mpi", "sched", "timer"); + + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * End: + * + * vim: ts=8 sts=4 sw=4 expandtab + */ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. cb53720e4fdb4a5df72cb55ec8cb4e70b3b50009
by noreply＠mcs.anl.gov 18 May '11

18 May '11

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 "Triton Repository". The branch, master has been updated via cb53720e4fdb4a5df72cb55ec8cb4e70b3b50009 (commit) from 7e0b2dd213d56c5e2b3075f04b0d058f8a2fc2be (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 cb53720e4fdb4a5df72cb55ec8cb4e70b3b50009 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed May 18 13:32:55 2011 -0400 rosd warning/bug fix ----------------------------------------------------------------------- Summary of changes: code/src/common/traffic-cop.hae | 2 +- code/src/replicated-osd/replicated-osd.aer | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Diff of changes: diff --git a/code/src/common/traffic-cop.hae b/code/src/common/traffic-cop.hae index 584bf47..7e2eafe 100644 --- a/code/src/common/traffic-cop.hae +++ b/code/src/common/traffic-cop.hae @@ -61,7 +61,7 @@ void __traffic_cop_remote_start_internal( #define traffic_cop_remote_finish(__addr, __retry_count, __token, __remote_return_code, __action) \ do{\ triton_ret_t __tret; \ - __traffic_cop_remote_finish_internal(__addr, __remote_return_code, __retry_count, __token, __action); \ + __traffic_cop_remote_finish_internal(__addr, __retry_count, __token, __remote_return_code, __action); \ __tret = aesop_hints_del("triton.traffic_cop.token"); \ if(__tret != TRITON_SUCCESS) \ triton_error_destroy(__tret); \ diff --git a/code/src/replicated-osd/replicated-osd.aer b/code/src/replicated-osd/replicated-osd.aer index 3807c19..4afac35 100644 --- a/code/src/replicated-osd/replicated-osd.aer +++ b/code/src/replicated-osd/replicated-osd.aer @@ -480,7 +480,7 @@ static __blocking triton_ret_t rosd_create_do_work( rctx, peer_addr, &req, NULL); traffic_cop_remote_finish( - peer_addr, remote_tret, retry_count, token, &action); + peer_addr, retry_count, token, remote_tret, &action); retry_count++; } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. af708f0635e1795967690d2cc0fd1d9eaede39c1
by noreply＠mcs.anl.gov 11 May '11

11 May '11

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 "Triton Repository". The branch, master has been updated via af708f0635e1795967690d2cc0fd1d9eaede39c1 (commit) from 90e9efb3564b95eb771f52ad63e59429b10a85ba (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 af708f0635e1795967690d2cc0fd1d9eaede39c1 Author: Kevin Harms <harms(a)alcf.anl.gov> Date: Wed May 11 17:54:22 2011 -0500 Warnings are currently masked in AE[R]CC compiles. This change causes most of the warnings to be printed out by default now. Common warnings that are caused by aesop are filtered out by default. ----------------------------------------------------------------------- Summary of changes: code/maint/aecc-utils.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/maint/aecc-utils.in b/code/maint/aecc-utils.in index a9ef718..a9022c8 100644 --- a/code/maint/aecc-utils.in +++ b/code/maint/aecc-utils.in @@ -506,6 +506,11 @@ runCmd() rm ${compilerout} return $res fi + if test "$verbose" = "yes"; then + cat ${compilerout} + else + cat ${compilerout} | grep -v "warning: redundant redeclaration" | grep -v " note: previous declaration" | grep -v "warning: no previous prototype for ‘ptsname_r’" + fi rm ${compilerout} } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 90e9efb3564b95eb771f52ad63e59429b10a85ba
by noreply＠mcs.anl.gov 10 May '11

10 May '11

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 "Triton Repository". The branch, master has been updated via 90e9efb3564b95eb771f52ad63e59429b10a85ba (commit) from 0690c659be7c10bf0d2c4b40dce9aa69d7e90c3a (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 90e9efb3564b95eb771f52ad63e59429b10a85ba Author: Kevin Harms <harms(a)alcf.anl.gov> Date: Tue May 10 14:37:28 2011 -0500 Add tags target for use with cscope. ----------------------------------------------------------------------- Summary of changes: code/Makefile.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/Makefile.in b/code/Makefile.in index 20d08a0..3c98655 100644 --- a/code/Makefile.in +++ b/code/Makefile.in @@ -649,6 +649,9 @@ cscope: > $(srcdir)/cscope.files ( cd @SRC_ABSOLUTE_TOP@; cscope -be -i @SRC_ABSOLUTE_TOP@/cscope.files ) +tags:: + find @SRC_ABSOLUTE_TOP@ -regex ".*\.$c\|h\|ae\|hae\|aer\|haer$" | ctags -L- --excmd=pattern -B --extra=+f --langmap=c:+.ae.aer.hae.haer -I pwait,pbranch -f @SRC_ABSOLUTE_TOP@/tags + #%.txt: %.doc # $(srcdir)/maint/handle-ditaa.py -j $(srcdir)/maint/ditaa/ditaa.jar -d $(dir $@) $< > $@ # hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 0690c659be7c10bf0d2c4b40dce9aa69d7e90c3a
by noreply＠mcs.anl.gov 10 May '11

10 May '11

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 "Triton Repository". The branch, master has been updated via 0690c659be7c10bf0d2c4b40dce9aa69d7e90c3a (commit) from b826eee9268b509e7f0ac000a09db557fe25d29e (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 0690c659be7c10bf0d2c4b40dce9aa69d7e90c3a Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue May 10 12:29:20 2011 -0500 Denote cause of progress problem ----------------------------------------------------------------------- Summary of changes: code/src/state/test/rosd-recover.ae | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/state/test/rosd-recover.ae b/code/src/state/test/rosd-recover.ae index 954fe31..b11075a 100644 --- a/code/src/state/test/rosd-recover.ae +++ b/code/src/state/test/rosd-recover.ae @@ -224,7 +224,8 @@ __blocking void do_remote_noop(void) puts("noop2"); - // if (mpi_rank != 2){return;} + /* Commenting out the triton_timer call here results in a hang */ + if (mpi_rank != 2){triton_timer(1); puts("return"); return;} pwait { hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. b826eee9268b509e7f0ac000a09db557fe25d29e
by noreply＠mcs.anl.gov 10 May '11

10 May '11

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 "Triton Repository". The branch, master has been updated via b826eee9268b509e7f0ac000a09db557fe25d29e (commit) from ece317ed6fae602ddd08d4fdcae4158def5dc414 (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 b826eee9268b509e7f0ac000a09db557fe25d29e Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue May 10 12:18:09 2011 -0500 Add problematic recovery test for discussion ----------------------------------------------------------------------- Summary of changes: code/src/state/test/module.mk.in | 1 + .../state/test/{rosd-maint.ae => rosd-recover.ae} | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) copy code/src/state/test/{rosd-maint.ae => rosd-recover.ae} (97%) Diff of changes: diff --git a/code/src/state/test/module.mk.in b/code/src/state/test/module.mk.in index a87cdc8..ba0cbda 100644 --- a/code/src/state/test/module.mk.in +++ b/code/src/state/test/module.mk.in @@ -21,6 +21,7 @@ STATE_TEST_SRC += $(DIR)/rosd-trigger.ae STATE_TEST_SRC += $(DIR)/rosd-peers.ae STATE_TEST_SRC += $(DIR)/rosd-maint.ae STATE_TEST_SRC += $(DIR)/rosd-injection.ae +STATE_TEST_SRC += $(DIR)/rosd-recover.ae # AETESTSRC += $(DIR)/state-client.ae STATE_TESTS = $(patsubst %.ae,%,$(STATE_TEST_SRC)) diff --git a/code/src/state/test/rosd-maint.ae b/code/src/state/test/rosd-recover.ae similarity index 97% copy from code/src/state/test/rosd-maint.ae copy to code/src/state/test/rosd-recover.ae index da9aa78..954fe31 100644 --- a/code/src/state/test/rosd-maint.ae +++ b/code/src/state/test/rosd-recover.ae @@ -121,6 +121,8 @@ __blocking void do_remote_shutdown(void) triton_ignore_t in, out; int i; + puts("do_remote_shutdown()..."); + /* get all the server addrs */ ret = triton_map_get(&map); @@ -220,6 +222,10 @@ __blocking void do_remote_noop(void) status = malloc(sizeof(int32_t)); *status = maintenance; + puts("noop2"); + + // if (mpi_rank != 2){return;} + pwait { pprivate int i; @@ -231,10 +237,10 @@ __blocking void do_remote_noop(void) pbranch { triton_mutex_lock(&oid_mutex); - while(oid.l < nobjects) + puts("noop3"); + // if (mpi_rank == 2) { - oid.l++; - + puts("noop4"); /* look up location of this object */ ret = triton_place_lookup(oid, 1, &svr_node); triton_error_assert(ret); @@ -265,11 +271,14 @@ __blocking void do_remote_noop(void) } } } + puts("noop5"); + return; } static int done = 0; static void cb(void *up) { + puts("done"); done=1; } @@ -447,12 +456,14 @@ int main(int argc, char *argv[]) test_start = MPI_Wtime(); ae_hints_init(&hints); + puts("noop"); ret = ae_post_blocking(do_remote_noop, cb, NULL, &hints, NULL, &op_id); - + puts("noop6"); while(!done) { ae_poll(NULL, CLIENT_POLL_TIMEOUT); } + puts("noop7"); ae_hints_destroy(&hints); test_end = MPI_Wtime(); noop_elapsed = test_end - test_start; @@ -460,6 +471,7 @@ int main(int argc, char *argv[]) if(mpi_rank >= nservers) { + puts("noop8"); MPI_Allreduce(&noop_elapsed, &noop_elapsed_time, 1, MPI_DOUBLE, MPI_MAX, client_comm); MPI_Allreduce(&noop_elapsed, &noop_min_elapsed_time, 1, hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. ece317ed6fae602ddd08d4fdcae4158def5dc414
by noreply＠mcs.anl.gov 10 May '11

10 May '11

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 "Triton Repository". The branch, master has been updated via ece317ed6fae602ddd08d4fdcae4158def5dc414 (commit) from 6df22ab26fb7921ef8749a886458e56140d9b5b6 (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 ece317ed6fae602ddd08d4fdcae4158def5dc414 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue May 10 11:21:38 2011 -0500 Fix perms ----------------------------------------------------------------------- Summary of changes: 0 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 code/src/state/test/rosd-injection.sh Diff of changes: diff --git a/code/src/state/test/rosd-injection.sh b/code/src/state/test/rosd-injection.sh old mode 100644 new mode 100755 hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 6df22ab26fb7921ef8749a886458e56140d9b5b6
by noreply＠mcs.anl.gov 10 May '11

10 May '11

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 "Triton Repository". The branch, master has been updated via 6df22ab26fb7921ef8749a886458e56140d9b5b6 (commit) via 480f18f165167f430916dd12639f56ceccd2cb8c (commit) via e529a4302f0ed26886b4fd9930cb88cac061a590 (commit) from 991d38acf405fa469ad8e137863553a582523107 (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 6df22ab26fb7921ef8749a886458e56140d9b5b6 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue May 10 11:12:34 2011 -0500 Sketch of system state-controlled fault injection- results in hang commit 480f18f165167f430916dd12639f56ceccd2cb8c Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue May 10 11:10:26 2011 -0500 New mapping file for faulty tests commit e529a4302f0ed26886b4fd9930cb88cac061a590 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue May 10 11:00:42 2011 -0500 Set fakess messaging method via zeroconf (enable faulty method) ----------------------------------------------------------------------- Summary of changes: code/src/fakess/fakess.ae | 24 ++++++++++++-- code/src/mapping/test/faulty2.txt | 2 + code/src/state/state-client.aer | 33 ++++++++++++++++++- code/src/state/state.ae | 15 ++++++--- code/src/state/state.hae | 2 + code/src/state/test/module.mk.in | 1 + .../test/{rosd-maint.ae => rosd-injection.ae} | 5 ++- .../test/{rosd-maint.sh => rosd-injection.sh} | 7 +++- 8 files changed, 75 insertions(+), 14 deletions(-) create mode 100644 code/src/mapping/test/faulty2.txt copy code/src/state/test/{rosd-maint.ae => rosd-injection.ae} (98%) copy code/src/state/test/{rosd-maint.sh => rosd-injection.sh} (64%) mode change 100755 => 100644 Diff of changes: diff --git a/code/src/fakess/fakess.ae b/code/src/fakess/fakess.ae index b25de24..2dc830a 100644 --- a/code/src/fakess/fakess.ae +++ b/code/src/fakess/fakess.ae @@ -6,9 +6,10 @@ #include "triton-config.h" #include "src/common/triton-hash.h" - #include "src/common/resources/scheduling/sched.hae" +#include "src/zeroconf/zeroconf.h" + #include "src/net/triton-message.hae" #include "src/mapping/mapping.hae" @@ -134,6 +135,8 @@ static int data_hash(const void *k, int table_size) triton_ret_t triton_fakess_node_add(triton_node_t node); +static const char *method_confkey = "triton.fakess.method"; + triton_ret_t triton_fakess_init(void) { triton_ret_t result; @@ -152,6 +155,9 @@ triton_ret_t triton_fakess_init(void) triton_debug_add_mask("triton.fakess.trace", &debug_trace, "Triton fake system state trace"); + triton_zeroconf_register(method_confkey, "mpi", NULL, + "fakess messaging method"); + triton_mutex_init(&fakess_mutex, NULL); fakess_nodes = triton_hash_init(node_compare, @@ -163,9 +169,18 @@ triton_ret_t triton_fakess_init(void) result = triton_fakess_node_add(triton_node_null); if (result != TRITON_SUCCESS) return result; - result = triton_msg_group_add("mpi", "triton.fakess", &msg_group); - triton_error_assert(result); + return result; +} + +triton_ret_t triton_fakess_init_stage2(void) +{ + triton_ret_t result; + + const char *method = triton_zeroconf_get(method_confkey); + assert(method); + result = triton_msg_group_add(method, "triton.fakess", &msg_group); + triton_error_assert(result); return result; } @@ -822,7 +837,8 @@ __attribute__((constructor)) void triton_fakess_init_register(void) { /* TODO: lose dep on MPI here */ triton_init_register("triton.fakess", - triton_fakess_init, triton_fakess_finalize, NULL, + triton_fakess_init, triton_fakess_finalize, + triton_fakess_init_stage2, "triton.core", "triton.mapping"); } diff --git a/code/src/mapping/test/faulty2.txt b/code/src/mapping/test/faulty2.txt new file mode 100644 index 0000000..b22b6f6 --- /dev/null +++ b/code/src/mapping/test/faulty2.txt @@ -0,0 +1,2 @@ +fault://0 123.456 +fault://1 233.560 diff --git a/code/src/state/state-client.aer b/code/src/state/state-client.aer index c4df8f6..8a8146a 100644 --- a/code/src/state/state-client.aer +++ b/code/src/state/state-client.aer @@ -107,6 +107,29 @@ __remote __blocking triton_ret_t state_client_propagation( return TRITON_SUCCESS; } +static void inject_local_fault() +{ + puts("entering faulty state..."); + triton_zeroconf_set("triton.net.fault_injector.insert_send_timeouts_at_rate", + "100"); + return; +} + +static void handle_state_change(triton_status_t *status) +{ + triton_string_t state; + triton_status_tostring(&state, *status); + triton_debug(debug, "new state: %s\n", triton_string_get(&state)); + triton_string_destroy(&state); + + if (*status == TRITON_STATUS_INJECTED) + { + inject_local_fault(); + } + + return; +} + __remote __blocking triton_ret_t state_client_admin_status_set( int32_t *status, triton_ignore_t *ignore) @@ -116,10 +139,16 @@ __remote __blocking triton_ret_t state_client_admin_status_set( triton_status_t *copy; triton_ret_t ret; - self = triton_map_self(); - triton_string_init(&key, "triton.state"); + /* Copy in from RPC */ copy = malloc(sizeof(triton_status_t)); *copy = *status; + + /* Local handling */ + handle_state_change(copy); + + /* Propagate into state system */ + self = triton_map_self(); + triton_string_init(&key, "triton.state"); ret = triton_state.post(self, &key, copy, sizeof(triton_status_t)); triton_string_destroy(&key); diff --git a/code/src/state/state.ae b/code/src/state/state.ae index df0d7db..b575b5f 100644 --- a/code/src/state/state.ae +++ b/code/src/state/state.ae @@ -12,25 +12,30 @@ triton_ret_t triton_status_tostring(const triton_string_t *result, switch (status) { - case TRITON_STATUS_PROTO: + case TRITON_STATUS_PROTO: s = "PROTO"; break; - case TRITON_STATUS_NOMINAL: + case TRITON_STATUS_NOMINAL: s ="NOMINAL"; break; - case TRITON_STATUS_RECOVERY: + case TRITON_STATUS_RECOVERY: s = "RECOVERY"; break; - case TRITON_STATUS_MAINTENANCE: + case TRITON_STATUS_MAINTENANCE: s = "MAINTENANCE"; break; - case TRITON_STATUS_FAILED: + case TRITON_STATUS_INJECTED: + s = "INJECTED"; + break; + case TRITON_STATUS_FAILED: s = "FAILED"; break; } if (s == NULL) + { return TRITON_ERR_INVAL; + } triton_string_init(result, s); return TRITON_SUCCESS; diff --git a/code/src/state/state.hae b/code/src/state/state.hae index 4c74e68..088473b 100644 --- a/code/src/state/state.hae +++ b/code/src/state/state.hae @@ -93,6 +93,8 @@ typedef enum TRITON_STATUS_RECOVERY, /** The node is unable to serve requests */ TRITON_STATUS_MAINTENANCE, + /** The node is in a simulated FAILED state */ + TRITON_STATUS_INJECTED, /** The node is out of the system */ TRITON_STATUS_FAILED } triton_status_t; diff --git a/code/src/state/test/module.mk.in b/code/src/state/test/module.mk.in index 03f6d67..a87cdc8 100644 --- a/code/src/state/test/module.mk.in +++ b/code/src/state/test/module.mk.in @@ -20,6 +20,7 @@ STATE_TEST_SRC += $(DIR)/rosd-status.ae STATE_TEST_SRC += $(DIR)/rosd-trigger.ae STATE_TEST_SRC += $(DIR)/rosd-peers.ae STATE_TEST_SRC += $(DIR)/rosd-maint.ae +STATE_TEST_SRC += $(DIR)/rosd-injection.ae # AETESTSRC += $(DIR)/state-client.ae STATE_TESTS = $(patsubst %.ae,%,$(STATE_TEST_SRC)) diff --git a/code/src/state/test/rosd-maint.ae b/code/src/state/test/rosd-injection.ae similarity index 98% copy from code/src/state/test/rosd-maint.ae copy to code/src/state/test/rosd-injection.ae index da9aa78..f309d93 100644 --- a/code/src/state/test/rosd-maint.ae +++ b/code/src/state/test/rosd-injection.ae @@ -204,7 +204,8 @@ __blocking void do_remote_noop(void) uint128_t oid; uint32_t flags = 0; - triton_status_t maintenance = TRITON_STATUS_MAINTENANCE; + // triton_status_t maintenance = TRITON_STATUS_MAINTENANCE; + triton_status_t injected = TRITON_STATUS_INJECTED; int32_t *status; int32_t ignore; @@ -218,7 +219,7 @@ __blocking void do_remote_noop(void) oid.u += mpi_rank; status = malloc(sizeof(int32_t)); - *status = maintenance; + *status = injected; pwait { diff --git a/code/src/state/test/rosd-maint.sh b/code/src/state/test/rosd-injection.sh old mode 100755 new mode 100644 similarity index 64% copy from code/src/state/test/rosd-maint.sh copy to code/src/state/test/rosd-injection.sh index 9a81231..3026073 --- a/code/src/state/test/rosd-maint.sh +++ b/code/src/state/test/rosd-injection.sh @@ -6,14 +6,19 @@ SCRIPT=$0 BIN=${SCRIPT%.sh} OUT=${BIN}.out +export triton_fakess_method=fault +export aesop_remote_default_net=fault + # Test with sorted input... mpiexec -l -n 4 ${VALGRIND} ${BIN} /tmp/rosd.db /tmp/rosd-log \ - 1 1 0 0 2 1 src/mapping/test/hosts2.txt > ${OUT} 2>&1 + 1 1 0 0 2 1 src/mapping/test/faulty2.txt > ${OUT} 2>&1 [[ $? == 0 ]] || exit 1 LINES=$( grep "status change:" ${OUT} | wc -l ) [[ $? == 0 ]] || exit 1 [[ ${LINES} == 6 ]] || exit 1 +grep "entering faulty state" ${OUT} | exit 1 + echo OK exit 0 hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 991d38acf405fa469ad8e137863553a582523107
by noreply＠mcs.anl.gov 10 May '11

10 May '11

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 "Triton Repository". The branch, master has been updated via 991d38acf405fa469ad8e137863553a582523107 (commit) from adb389e3c660705d93774437727148da554d4d47 (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 991d38acf405fa469ad8e137863553a582523107 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue May 10 09:56:07 2011 -0500 Draft states table ----------------------------------------------------------------------- Summary of changes: code/doc/fault-handling-overview.txt | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/doc/fault-handling-overview.txt b/code/doc/fault-handling-overview.txt index d2c5f46..f2bb7ce 100644 --- a/code/doc/fault-handling-overview.txt +++ b/code/doc/fault-handling-overview.txt @@ -181,6 +181,20 @@ into each RPC) to correlate high level client operations to RPCs. == How ROSD servers recover and rebuild after a fault [[rosd_rec_reb]] +Index to server states and meanings (cf. +src/state/state.hae+): + +[width="30%"] +|=============================================================== +| *State* | *Meaning* +| PROTO | The node is joining the system +| NOMINAL | The node is healthy +| RECOVERY | The node is recovering metadata from neighbors +| MAINTENANCE | The node is in a administrative state +| INJECTED | The node is in a simulated FAILED state +| FAILED | The node is out of the system and not self-aware: + a node should never observe this state locally +|================================================================ + [graphviz,rosd-rec-reb.png] ------------------------------------ digraph rosd_rec_reb { @@ -278,6 +292,10 @@ changes will be applied as usual too. This allows stubs to stay in sync even while rebuilds are occuring at the same time (ie, avoiding the problem of "chasing a moving target" when trying to rebuild). +"rebuild" state is equivalent to "nominal" state, in that client +requests are still handled, but there is re-replication work in the +rebuild queue to perform. + ==== Promoting primaries Note that the steps outlined in this section make no mention of promoting or hooks/post-receive -- Triton Repository

1 0