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

Triton Repository branch, master, updated. 96c1dda2447fffee0cc54e72086f351dc2704c01
by noreply＠mcs.anl.gov 31 Mar '11

31 Mar '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 96c1dda2447fffee0cc54e72086f351dc2704c01 (commit) from 9d706004c0a856d1248ff00902ceeffe4e70a2bd (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 96c1dda2447fffee0cc54e72086f351dc2704c01 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Mar 31 16:10:39 2011 -0400 simplify niid handling in ROSD create operation ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/replicated-osd.aer | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) Diff of changes: diff --git a/code/src/replicated-osd/replicated-osd.aer b/code/src/replicated-osd/replicated-osd.aer index 0605b7d..65c57df 100644 --- a/code/src/replicated-osd/replicated-osd.aer +++ b/code/src/replicated-osd/replicated-osd.aer @@ -178,16 +178,14 @@ __blocking triton_ret_t rosd_create_local_storage( obj_offset = 0; buffer_offsets[0] = (char*)&replication_factor; size = sizeof(replication_factor); - /* NOTE: we do have to track the niid here as this is part of an - * operation that is non-idempotent overall + + /* 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 = vosd_write(oid, REP_FACTOR_FORK, 1, buffer_offsets, &size, 1, &obj_offset, &size, 1, VOSD_FLAG_AUTO_TXN, niid); - /* note: could get two interesting return codes; either the NIID has - * already been committed, or the txn (created by the AUTO_TXN flag) is - * already open. - */ - if(tret == TRITON_ERR_NIID_DONE || tret == TRITON_ERR_TXN_ALREADY) + if(tret == TRITON_ERR_TXN_ALREADY) { /* already done */ triton_error_destroy(tret); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 9d706004c0a856d1248ff00902ceeffe4e70a2bd
by noreply＠mcs.anl.gov 30 Mar '11

30 Mar '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 9d706004c0a856d1248ff00902ceeffe4e70a2bd (commit) from 241d66b2324c0bfd36e00448a304f15688375626 (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 9d706004c0a856d1248ff00902ceeffe4e70a2bd Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Mar 30 15:09:56 2011 -0400 notes about TOSD optimizations ----------------------------------------------------------------------- Summary of changes: code/doc/fault-handling-overview.txt | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/doc/fault-handling-overview.txt b/code/doc/fault-handling-overview.txt index db3410e..d2c5f46 100644 --- a/code/doc/fault-handling-overview.txt +++ b/code/doc/fault-handling-overview.txt @@ -483,3 +483,20 @@ Regardless who triggers it, these are the steps to failing a server: . OPTIONAL: for testing purposes we can set the messaging method to 100% loss rate to simulate a server that has experienced a hardware failure +== TOSD enhancements + +The TOSD (ie, VOSD) currently has a limited API that allows users to create, +destroy, read, and write objects. This document assumes that we will +enhance the TOSD API to make the following kinds of operations more +efficient: + +* Bulk operations: like creating a large number of stub objects +simultaneously +* Range queries: scanning for objects within a specified ID range +* Range queries with metadata: pulling values like the replication factor +from each object as part of a range query + +These operations will probably be implemented inefficiently at first until +we implement the first cut of recovery and rebuild to make sure that we have +the right API and use cases. Then we can go back and optimize these as +needed within the TOSD. hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 241d66b2324c0bfd36e00448a304f15688375626
by noreply＠mcs.anl.gov 30 Mar '11

30 Mar '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 241d66b2324c0bfd36e00448a304f15688375626 (commit) via b94faeb8fb5736b9badafbc747bdc3dab58ffa25 (commit) via 7337952caa39029055b9d83b3f534d500beaaed6 (commit) via 6abaa79a4d94d2e267f3e2b97bb5278c475ec0bd (commit) via ae05e38b40d84dd873555c2340cf71b217976919 (commit) via abbf89c84e550fbb43ce1577830b2354848fbaec (commit) from 1989bef90177f3d4406ef6d016d23e12c8092290 (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 241d66b2324c0bfd36e00448a304f15688375626 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Mar 30 14:50:53 2011 -0400 clarify placement definition commit b94faeb8fb5736b9badafbc747bdc3dab58ffa25 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Mar 30 14:48:26 2011 -0400 notes about accessing data on rebuilding replicas commit 7337952caa39029055b9d83b3f534d500beaaed6 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Mar 30 14:36:06 2011 -0400 more notes - how primaries are promoted implicitly - why we don't allow client access during recovery commit 6abaa79a4d94d2e267f3e2b97bb5278c475ec0bd Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Mar 30 14:09:50 2011 -0400 a blurb about rebuild scheduling commit ae05e38b40d84dd873555c2340cf71b217976919 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Mar 30 14:04:09 2011 -0400 text cleanup commit abbf89c84e550fbb43ce1577830b2354848fbaec Author: Phil Carns <carns(a)mcs.anl.gov> Date: Wed Mar 30 14:02:01 2011 -0400 retool recovery steps based on feedback from Kevin ----------------------------------------------------------------------- Summary of changes: code/doc/fault-handling-overview.txt | 255 +++++++++++++++++++++++----------- 1 files changed, 172 insertions(+), 83 deletions(-) Diff of changes: diff --git a/code/doc/fault-handling-overview.txt b/code/doc/fault-handling-overview.txt index f3f8916..db3410e 100644 --- a/code/doc/fault-handling-overview.txt +++ b/code/doc/fault-handling-overview.txt @@ -37,7 +37,9 @@ of the current state of the system according to gossip presents information as if had been obtained via gossip * Placement algorithm: This is the algorithm that maps an arbitrary object id onto a set of server ids. This is a deterministic algorithm. The -current implementation uses consistent hashing in a manner similar to PAST. +current implementation uses consistent hashing to map an object ID to the N +closest server IDs in a ring. This is similar to PAST, except that all +servers (and their IDs) are known ahead of time from gossip. == Fault scenarios from an ROSD server perspective @@ -58,12 +60,11 @@ digraph rosd_faults { "success" -> "success ack"; "local storage fault" -> "wait for remote requests to complete"; "wait for remote requests to complete" -> "mark local server as down"; -"mark local server as down" -> "initiate recovery"; +"mark local server as down" -> "error ack (please retry)"; "remote network failure" -> "Traffic cop suggests retry?"; "Traffic cop suggests retry?" -> "forward to replica" [label="yes"]; "Traffic cop suggests retry?" -> "remote node failure" [label="no"]; -"remote node failure" -> "initiate recovery"; -"initiate recovery" -> "error ack (please retry)"; +"remote node failure" -> "error ack (please retry)"; "remote storage failure" -> "remote node failure"; } ------------------------------ @@ -94,11 +95,11 @@ replica later on . Remote failure due to a storage fault * Similar to network failure case, except that there are no retries. -Rebuild is initiated immediately -Note that multiple servers may decide to initiate recovery. This should be -an idempotent operation so that there is no harm in trying to initiate a recovery -that is already in progress on the affected servers. +Note that there is no explicit step to initiate the recovery and rebuild +process from this state machine. Recovery and rebuild will instead be +triggered by a gossip notification on the affected servers. See the the +section on <<rosd_rec_reb,ROSD recovery and rebuild>> for more details. == Fault scenarios from a client perspective [[client-faults]] @@ -178,13 +179,32 @@ The Traffic Cop will use identifiers for each operation (passed as a hint into each RPC) to correlate high level client operations to RPCs. == How ROSD servers recover and rebuild after a fault +[[rosd_rec_reb]] -From the ROSD server perspective, there are two procedures that must be -performed after a fault has been detected. The first is <<recovery, -ROSD recovery>>, which does the bare minimum amount of work necessary -to resume servicing all client requests in degraded mode. The second -is <<rebuild, ROSD rebuild>>, in which complete data is transferred to -new replicas in order to regain the desired level of fault tolerance. +[graphviz,rosd-rec-reb.png] +------------------------------------ +digraph rosd_rec_reb { +"normal operation" -> "fault detection and dissemination" [label="node failure"]; +"fault detection and dissemination" -> "recovery" [label="notify servers"]; +"recovery" -> "rebuild" [label="return to service"]; +"rebuild" -> "normal operation" [label="data fully replicated"]; +} +------------------------------------ + +The ROSD servers will monitor gossip to discover when a relevant neighbor +has failed. A relevant neighbor is any of the N*2 nearest servers, where N +is the maximum replication factor supported by the storage system. + +Once the ROSD is aware of a failure, it will first enter a +<<recovery,recovery mode>>. Recovery mode is used to identify missing +objects and regain placement algorithm consistency. Recovery mode should +occur quickly (on the order of a few minutes), but during that time the +server _will not_ service client requests. + +Once recovery is complete, the ROSD server will initiate <<rebuild, +rebuild mode>> in which the servers transfer object data to new replicas +in order to regain the desired replication level for all objects. +During this time the server _will_ service client requests. === ROSD recovery [[recovery]] @@ -202,65 +222,50 @@ stubs that are either out of sync or do not have a fully copy of the data yet. If a client hits one of those stubs then it will get a nack that says "please try the primary instead". -At a high level, recovery needs to identify affected objects and servers, -figure out where replicas will be rebuilt, figure out which objects need to -be resynchronized (due to incomplete modifications), and reach a consistent -state for object placement by at least putting object stubs on all the right -servers. - -Note that some of the steps outlined here could be simplified if we assumed -that all reads are directed at primaries for now. - -Here are the recovery steps in greater detail: - -. identify potentially affected servers: the M*2 servers closest to the -failed server, where M is the maximum allowed replication level - -. insure that all affected servers have started recovery - -. set all affected servers to "recovering state", in which they either queue -incoming requests or nack with "try again in N seconds" - -. on the two servers closest to the failed server: -.. perform a range query in the object ID space to generate a list of -objects that might have been shared with the failed server -.. for each candidate object: -... check its replication level and placement to confirm if a copy resided -on the failed server or not. The result is a filtered "affected object -list" - -. for each object in the "affected object list" -.. calculate the next unused neighbor for that object -.. put the object on a "rebuild object list" for that target server -.. if the object has a write in flight: -... abort the write transaction and add the object to a "resynchronize -object list" -.. send the "rebuild object list" to each appropriate server -.. keep the "resynchronize object list" local - -. for each server that has a "rebuild object list": -.. create local placeholders (ie, stubs, or diversion pointers) for each new -replica object -* These stubs have metadata indicating that the object is incomplete -*** Recall that new replicas (and therefore stubs) are _always_ at the end -fo the replica chain, they should never be in a primary position for an -object -* Having stubs in place insures the following: -** the placement rules are not violated (all objects exist on all servers -that are supposed to own them) -** a target is available for future incoming operations (write, delete, -etc.) to act on without adding special case logic to the ROSD replication -** clients that attempt to access incomplete replicas will get a well known -nack telling them to use the primary instead - -. for each object in the "resynchronize object list" on the two closest -servers (which should be small or empty in most cases): -.. send requests to every non-primary replica to turn it into a stub -* in this case data is not destroyed on the replicas; we are simply marking -them as non-authoritative for now. - -. mark all servers as available for service again from the client's -perspective +At a high level, recovery on a given server must identify missing +replicas, identify replicas that need to be resynchronized (due to +incomplete modifications), and reach a consistent state for object +placement by at least putting object stubs on all the right servers. Each +affected server will pursue these steps independently. + +Recovery will only run on the N*2 servers that are within N positions of the +failed server, where N is the maximum replication level allowed by the +storage system. It does not need to run on all servers in the system. + +The following is a list of recovery steps that will be executed on each +affected server. Note that a "missing object" refers to a new replica that +needs to be created in order to conteract the fact that a replica was lost +on a failed server. + +. enter "recovering state", in which the server either queues +incoming requests or nacks with "try again in N seconds" + +. query the two adjacent servers in the ID space to get a list of missing object IDs that need to be created locally +* those two servers can identify all missing local replicas because they are the +only servers that could be replication parents for local objects + +. create a local placeholder (ie, a <<stub,stub>>) for each missing object + +. scan local objects in order to prepare to answer queries from neighbors +for missing objects +.. perform range query within object ID space that may have been owned by +the failed server +.. for each object: +... check replication level and placement algorithm to determine if +this server was (previously) the last in the replica chain +... if so, add object ID to list of missing replicas for one of its adjacent +peers +... provide list to peer servers when they query + +. record list of object IDs for any write operations that were aborted +due to node failure +.. close open write transactions on those objects +.. contact surviving down-stream replicas and tell them to mark that object +ID as a "stub" + +. enter "rebuild" state +* allow access from clients again while servers work to transfer data to +replica stubs, see next section At this point clients can attempt to access any object. All primary objects and some secondary objects will respond in a perfectly normal manner. Some @@ -273,21 +278,62 @@ 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). +==== Promoting primaries + +Note that the steps outlined in this section make no mention of promoting or +electing new primaries following a failure. This is intentional. The 2nd +replica in a replica chain will become a primary automatically by virtue of +its position according to the placement algorithm. There are +no additional steps to take. We just need to take care not to mark a +primary object as a stub. + +==== Rationale for stubs +[[stub]] + +* stubs have metadata indicating that the object data is incomplete +* new replicas (and therefore stubs) are always at the _end_ of the replica +chain +* Having stubs in place after recovery insures the following: +** the placement rules are not violated (all objects exist on all servers +that are supposed to own them) +** a target is available for future incoming operations (write, delete, +etc.) to act on without adding special case logic to the ROSD replication +** clients that attempt to access incomplete replicas will get a well known +nack telling them to use the primary instead + +==== Rationale for disabling client access during recovery + +Clients request will either be queued or retried until recovery is complete. +There are a few reasons for this decision, at least in the prototype phase. +The first is that the object placement will be inconsistent. For example, +if a client attempts to access a replica that doesn't exist, then the server +has no way to know if the object really doesn't exist or if it does exist +but doesn't have a stub yet. + +In theory we could allow some types of access to primary objects during +recovery. The hardest part there would be how to handle operations that +modify the object. Write operations, for example, may or may not be able to +relay to the final replica stub. Remove operations may race against +creation of a replica stub. + +For now we will not allow any client access during recovery, but we need to +benchmark and tune the recovery process to make sure that it is sufficiently +fast to prevent this from being a problem. + ==== Additional failures during recovery If one or more additional servers fail while recovery is in progress, then -the safest general approach will be to: +the safest general approach will be to simply restart the recovery process +on all affected servers. The number of affected servers will be expanded to +include those within maximum replication distance of both failed nodes. -* Halt all current recovery activity (scanning objects, creating stubs, - etc.) -* Expand the scope of recovery to additional servers if needed -* Restart entire recovery process from the beginning, except this time -generating the "affected object list" on the two servers adjacent to -_each_ failed server +The recovery process will be restarted from scratch to make sure that we +don't accidentally assume that we have finished creating stubs for an object +already if it actually requires additional stubs due to the second failure. -This requires that stub creation be idempotent- restarting this process may -result in an attempt to create a stub that was already put in place before -the second failure. +This requires that stub creation be idempotent in case a server calculates +that it needs to create a new stub when there is one already in place from a +previous recovery attempt. TODO: any special action to take if the there are more _adjacent_ failed servers than the default replication level can tolerate? In that case we @@ -354,6 +400,30 @@ to multiple failures: * If a child detects a parent failure while receiving serialized data: ** restart rebuild to next parent +==== Scheduling data transfers + +At a global level, there will be a set of servers that each need to +pull replica data for some objects from some peers. In the long run a +research contribution here would be to determine an optimal global schedule +for the data transfers so that we utilize the network and disks effectively +and priorities critical objects. + +We won't do this in the prototype, but here are some thing that we will want +to consider when we tackle this topic: + +* coming up with a distributed schedule will require some coordination +across servers +* we could collect useful data for scheduling (like the size of each object) +during the recovery scan process, if it doesn't add too much overhead +* most scheduling activity, however, should happen _after_ recovery so that +we minimize the time in which clients can't interact with objects +* we should rebuild partially synced objects first +** the most likely source of partially synced objects are objects that had a +write in flight when the failure occured. Since these objects are "hot" it +makes sense to try to return them to service ASAP. + + + == How clients interact with recovering or rebuilding servers We want clients to interact gracefully with recovering or rebuilding @@ -374,6 +444,25 @@ machine) ** timeout, perceived transient network error, or retryable error ** retryable errors includes server responses that say "I'm dead" +=== Possible optimization: allowing client access to rebuilding replicas + +It is technically possible for clients to read _some_ data from replicas +that haven't fully rebuilt yet. In order to do this, a replica server has +to have first contacted its parent to determine what data its missing. The +replica server can then differentiate between stale data, up to date data, +and data that has been overwritten by recent writes. + +This will happen implicitly when a replica contacts its parent to rebuild a +particular object. All of the necessary version information is exchanged at +that time. + +Clients could therefore be able to read some data from rebuilding replicas +as long as they have at least started or queued up the rebuild process for +that object. If we wanted to we could initiate a rebuild on demand if a +client tried to access a rebuilding replica. + +We aren't going to do this in the prototype phase. + == Explicitly failing a server [[explicit-fail]] hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 1989bef90177f3d4406ef6d016d23e12c8092290
by noreply＠mcs.anl.gov 29 Mar '11

29 Mar '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 1989bef90177f3d4406ef6d016d23e12c8092290 (commit) via a74b6fb8e8f7f73a396c480c0b86c54722043c9c (commit) from 4e796ee6d82cf399a5309d80cd26975fe06810c7 (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 1989bef90177f3d4406ef6d016d23e12c8092290 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 17:31:45 2011 -0500 Wrapper scripts for target state_test_results commit a74b6fb8e8f7f73a396c480c0b86c54722043c9c Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 17:29:32 2011 -0500 Extra assert() ----------------------------------------------------------------------- Summary of changes: code/src/fakess/fakess.ae | 3 +++ code/src/state/test/local.ae | 1 + code/src/state/test/{shutdown.sh => local.sh} | 2 +- code/src/state/test/module.mk.in | 17 ++++++++++------- code/src/state/test/rosd-global.sh | 19 +++++++++++++++++++ code/src/state/test/rosd-peers.sh | 19 +++++++++++++++++++ .../post-global.sh => state/test/rosd-start.sh} | 7 ++----- code/src/state/test/rosd-status.sh | 19 +++++++++++++++++++ code/src/state/test/rosd-trigger.sh | 19 +++++++++++++++++++ code/src/state/test/rpc-global.ae | 12 ++++++------ code/src/state/test/rpc-global.sh | 4 ++-- 11 files changed, 101 insertions(+), 21 deletions(-) copy code/src/state/test/{shutdown.sh => local.sh} (84%) create mode 100755 code/src/state/test/rosd-global.sh create mode 100755 code/src/state/test/rosd-peers.sh copy code/src/{fakess/test/post-global.sh => state/test/rosd-start.sh} (51%) create mode 100755 code/src/state/test/rosd-status.sh create mode 100755 code/src/state/test/rosd-trigger.sh Diff of changes: diff --git a/code/src/fakess/fakess.ae b/code/src/fakess/fakess.ae index 0d13aef..e277137 100644 --- a/code/src/fakess/fakess.ae +++ b/code/src/fakess/fakess.ae @@ -272,6 +272,9 @@ triton_ret_t triton_fakess_node_add(triton_node_t node) } */ + /* if this fails, we probably did not call triton_fakess_init() */ + assert(fakess_nodes); + link = triton_hash_search(fakess_nodes, &node); if (link) return TRITON_ERR_EXIST; diff --git a/code/src/state/test/local.ae b/code/src/state/test/local.ae index 06f3a38..021439c 100644 --- a/code/src/state/test/local.ae +++ b/code/src/state/test/local.ae @@ -24,6 +24,7 @@ static __blocking int dostuff(void) sprintf(value, "sample_value"); triton_map_init(); + triton_fakess_init(); triton_fakess_init_self(); triton_fakess_state_install(); triton_state.item_add(triton_node_null, &key); diff --git a/code/src/state/test/shutdown.sh b/code/src/state/test/local.sh similarity index 84% copy from code/src/state/test/shutdown.sh copy to code/src/state/test/local.sh index 6c58179..f726528 100755 --- a/code/src/state/test/shutdown.sh +++ b/code/src/state/test/local.sh @@ -10,7 +10,7 @@ OUT=${BIN}.out mpiexec -l -n 3 ${BIN} src/mapping/test/hosts2.txt > ${OUT} 2>&1 [[ $? == 0 ]] || exit 1 -LINES=$( grep "done" ${OUT} | wc -l ) +LINES=$( grep "got: sample_value" ${OUT} | wc -l ) [[ $? == 0 ]] || exit 1 [[ ${LINES} == 3 ]] || exit 1 diff --git a/code/src/state/test/module.mk.in b/code/src/state/test/module.mk.in index 6c0b478..42cae4a 100644 --- a/code/src/state/test/module.mk.in +++ b/code/src/state/test/module.mk.in @@ -27,13 +27,16 @@ state_tests: $(STATE_TESTS) AETESTSRC += $(STATE_TEST_SRC) -STATE_TEST_RESULTS := -STATE_TEST_RESULTS += $(DIR)/shutdown.result -STATE_TEST_RESULTS += $(DIR)/post-global.result -STATE_TEST_RESULTS += $(DIR)/engine1.result -STATE_TEST_RESULTS += $(DIR)/rpc-size.result -STATE_TEST_RESULTS += $(DIR)/rpc-global.result -STATE_TEST_RESULTS += $(DIR)/rpc-list.result +STATE_TEST_RESULTS := $(patsubst %.ae,%.result,$(STATE_TEST_SRC)) + +# STATE_TEST_RESULTS := +# STATE_TEST_RESULTS += $(DIR)/local.result +# STATE_TEST_RESULTS += $(DIR)/shutdown.result +# STATE_TEST_RESULTS += $(DIR)/post-global.result +# STATE_TEST_RESULTS += $(DIR)/engine1.result +# STATE_TEST_RESULTS += $(DIR)/rpc-size.result +# STATE_TEST_RESULTS += $(DIR)/rpc-global.result +# STATE_TEST_RESULTS += $(DIR)/rpc-list.result TEST_RESULTS += $(STATE_TEST_RESULTS) diff --git a/code/src/state/test/rosd-global.sh b/code/src/state/test/rosd-global.sh new file mode 100755 index 0000000..b6a5996 --- /dev/null +++ b/code/src/state/test/rosd-global.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +[[ -n ${TRITON_SCRIPT_DEBUG} ]] && set -x + +SCRIPT=$0 +BIN=${SCRIPT%.sh} +OUT=${BIN}.out + +# 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 +[[ $? == 0 ]] || exit 1 + +LINES=$( grep "value: 23" ${OUT} | wc -l ) +[[ $? == 0 ]] || exit 1 +[[ ${LINES} == 2 ]] || exit 1 + +echo OK +exit 0 diff --git a/code/src/state/test/rosd-peers.sh b/code/src/state/test/rosd-peers.sh new file mode 100755 index 0000000..beebe9a --- /dev/null +++ b/code/src/state/test/rosd-peers.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +[[ -n ${TRITON_SCRIPT_DEBUG} ]] && set -x + +SCRIPT=$0 +BIN=${SCRIPT%.sh} +OUT=${BIN}.out + +# 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 +[[ $? == 0 ]] || exit 1 + +LINES=$( grep "status change:" ${OUT} | wc -l ) +[[ $? == 0 ]] || exit 1 +[[ ${LINES} == 8 ]] || exit 1 + +echo OK +exit 0 diff --git a/code/src/fakess/test/post-global.sh b/code/src/state/test/rosd-start.sh similarity index 51% copy from code/src/fakess/test/post-global.sh copy to code/src/state/test/rosd-start.sh index ff1af73..f7211e9 100755 --- a/code/src/fakess/test/post-global.sh +++ b/code/src/state/test/rosd-start.sh @@ -7,12 +7,9 @@ BIN=${SCRIPT%.sh} OUT=${BIN}.out # Test with sorted input... -mpiexec -l -n 4 ${BIN} src/mapping/test/hosts2.txt > ${OUT} 2>&1 +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 [[ $? == 0 ]] || exit 1 -LINES=$( grep "done" ${OUT} | wc -l ) -[[ $? == 0 ]] || exit 1 -[[ ${LINES} == 4 ]] || exit 1 - echo OK exit 0 diff --git a/code/src/state/test/rosd-status.sh b/code/src/state/test/rosd-status.sh new file mode 100755 index 0000000..3150d97 --- /dev/null +++ b/code/src/state/test/rosd-status.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +[[ -n ${TRITON_SCRIPT_DEBUG} ]] && set -x + +SCRIPT=$0 +BIN=${SCRIPT%.sh} +OUT=${BIN}.out + +# 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 +[[ $? == 0 ]] || exit 1 + +LINES=$( grep "status:" ${OUT} | wc -l ) +[[ $? == 0 ]] || exit 1 +[[ ${LINES} == 2 ]] || exit 1 + +echo OK +exit 0 diff --git a/code/src/state/test/rosd-trigger.sh b/code/src/state/test/rosd-trigger.sh new file mode 100755 index 0000000..3150d97 --- /dev/null +++ b/code/src/state/test/rosd-trigger.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +[[ -n ${TRITON_SCRIPT_DEBUG} ]] && set -x + +SCRIPT=$0 +BIN=${SCRIPT%.sh} +OUT=${BIN}.out + +# 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 +[[ $? == 0 ]] || exit 1 + +LINES=$( grep "status:" ${OUT} | wc -l ) +[[ $? == 0 ]] || exit 1 +[[ ${LINES} == 2 ]] || exit 1 + +echo OK +exit 0 diff --git a/code/src/state/test/rpc-global.ae b/code/src/state/test/rpc-global.ae index 4c95109..c0d5a6e 100644 --- a/code/src/state/test/rpc-global.ae +++ b/code/src/state/test/rpc-global.ae @@ -55,6 +55,11 @@ static __blocking void doclienttest(void) t = (int *)value.buffer.buffer; printf("client: value: %i\n", *t); + + remote_state_client_size(AER_DEFAULT_CTX, server, &dummy, &size); + + printf("client: size: %i\n", size); + return; } @@ -127,9 +132,7 @@ static __blocking int doserver() pbranch { triton_timer(20000); - printf("stop service engine\n"); aer_service_engine_stop(); - printf("stop state engine\n"); triton_state.engine_stop(); } } @@ -159,12 +162,8 @@ static __blocking int dostuff(char *filename) doclienttest(); } - printf("did stuff\n"); - triton_timer(10000); - printf("exit dostuff()\n"); - return 0; } @@ -230,6 +229,7 @@ int main(int argc, char *argv[]) /* * Local Variables: + * mode: c * c-basic-offset: 4 * End: * diff --git a/code/src/state/test/rpc-global.sh b/code/src/state/test/rpc-global.sh index 125e276..0d7930f 100755 --- a/code/src/state/test/rpc-global.sh +++ b/code/src/state/test/rpc-global.sh @@ -11,9 +11,9 @@ mpiexec -l -n 4 ${BIN} src/mapping/test/hosts2.txt > ${OUT} 2>&1 LINES=$( grep "value: 34" ${OUT} | wc -l ) [[ $? == 0 ]] || exit 1 -[[ ${LINES} == 5 ]] || exit 1 +[[ ${LINES} == 3 ]] || exit 1 -LINES=$( grep "done" ${OUT} | wc -l ) +LINES=$( grep "size: 3" ${OUT} | wc -l ) [[ $? == 0 ]] || exit 1 [[ ${LINES} == 4 ]] || exit 1 hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 4e796ee6d82cf399a5309d80cd26975fe06810c7
by noreply＠mcs.anl.gov 29 Mar '11

29 Mar '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 4e796ee6d82cf399a5309d80cd26975fe06810c7 (commit) via fbfe9b316b993e2d66a6cd3e282cf01c0211e7df (commit) via c1061603ec96a1a0584b069ec85d57ad07e28be7 (commit) via 2631e6e97a19a48eb8d77faab545ff24d0114f9e (commit) via fd51e178f3cd01e4495efd6d7e769c3e7d8db565 (commit) via 28669eba278a3171c56fc08b5e843f0f1556309a (commit) via a9a308541f9ad39320cd6bc083aeb7912d130973 (commit) via a379f96d8ddf921d1fd0c5e740cb06fe82ee1c3b (commit) via 60118340482e47d16bea77e05f628a927baf22aa (commit) via 8eb3f06b28024f64cf536c1da8ebda536d9746b4 (commit) from d5effcad48eea23cb4ca1395511d975571d6949a (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 4e796ee6d82cf399a5309d80cd26975fe06810c7 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 16:42:21 2011 -0500 New test to demonstrate state change handler loop (ref #75) commit fbfe9b316b993e2d66a6cd3e282cf01c0211e7df Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 16:41:48 2011 -0500 Shorten string representations commit c1061603ec96a1a0584b069ec85d57ad07e28be7 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 16:38:56 2011 -0500 Add emacs mode commit 2631e6e97a19a48eb8d77faab545ff24d0114f9e Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 16:38:41 2011 -0500 Whitespace commit fd51e178f3cd01e4495efd6d7e769c3e7d8db565 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 16:20:19 2011 -0500 Add return value commit 28669eba278a3171c56fc08b5e843f0f1556309a Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 16:19:29 2011 -0500 This can be const commit a9a308541f9ad39320cd6bc083aeb7912d130973 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 14:34:44 2011 -0500 New triton_status_tostring() commit a379f96d8ddf921d1fd0c5e740cb06fe82ee1c3b Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 14:21:44 2011 -0500 Add footer commit 60118340482e47d16bea77e05f628a927baf22aa Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 13:52:03 2011 -0500 Update note commit 8eb3f06b28024f64cf536c1da8ebda536d9746b4 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 13:48:35 2011 -0500 Add prototype for propagation ----------------------------------------------------------------------- Summary of changes: code/src/fakess/fakess.ae | 2 +- code/src/mapping/mapping.ae | 3 +- code/src/placement/placement.ae | 1 + code/src/state/state-client.haer | 4 + code/src/state/state.ae | 41 +++++++ code/src/state/state.hae | 3 + code/src/state/test/module.mk.in | 8 ++ .../state/test/{rosd-trigger.ae => rosd-peers.ae} | 124 ++++++++++++++++---- code/src/state/test/rosd-trigger.ae | 2 +- 9 files changed, 160 insertions(+), 28 deletions(-) copy code/src/state/test/{rosd-trigger.ae => rosd-peers.ae} (81%) Diff of changes: diff --git a/code/src/fakess/fakess.ae b/code/src/fakess/fakess.ae index 996aa8b..0d13aef 100644 --- a/code/src/fakess/fakess.ae +++ b/code/src/fakess/fakess.ae @@ -691,7 +691,7 @@ __blocking triton_ret_t triton_fakess_engine_start(void) triton_timer(2); } if(fakess_ret != TRITON_ERR_CANCELED && - fakess_ret != TRITON_SUCCESS) + fakess_ret != TRITON_SUCCESS) { triton_log_error(triton_log_default, fakess_ret, "triton_fakess_recv() error.\n"); } diff --git a/code/src/mapping/mapping.ae b/code/src/mapping/mapping.ae index a442f01..c3aa68d 100644 --- a/code/src/mapping/mapping.ae +++ b/code/src/mapping/mapping.ae @@ -20,7 +20,7 @@ static void destroy_map(void); triton_ret_t triton_map_init(void) { - printf("triton_map_init()\n"); + // printf("triton_map_init()\n"); triton_debug_add_mask("triton.mapping", &debug, "Outputs mapping state from addresses " "to nodes"); @@ -208,6 +208,7 @@ triton_ret_t triton_map_contains(triton_node_t node, triton_ret_t triton_map_get(triton_list_t **list) { *list = &triton_map; + return TRITON_SUCCESS; } void triton_map_debug_nodes(int count, const triton_node_t *nodes) diff --git a/code/src/placement/placement.ae b/code/src/placement/placement.ae index dcac0f2..a0749d1 100644 --- a/code/src/placement/placement.ae +++ b/code/src/placement/placement.ae @@ -127,6 +127,7 @@ static void triton_place_finalize() /* * Local Variables: + * mode: c * c-basic-offset: 4 * End: * diff --git a/code/src/state/state-client.haer b/code/src/state/state-client.haer index e6c0478..222b963 100644 --- a/code/src/state/state-client.haer +++ b/code/src/state/state-client.haer @@ -43,6 +43,10 @@ __remote __blocking triton_ret_t state_client_lookup( struct sc_lookup_pair *pair, struct sc_lookup_value *value); +__remote __blocking triton_ret_t state_client_propagation( + int32_t *in_nothing, + int32_t *out_time); + #endif /* diff --git a/code/src/state/state.ae b/code/src/state/state.ae index 7785a8f..df0d7db 100644 --- a/code/src/state/state.ae +++ b/code/src/state/state.ae @@ -4,3 +4,44 @@ struct triton_state_funcs triton_state; triton_status_t triton_status = TRITON_STATUS_PROTO; + +triton_ret_t triton_status_tostring(const triton_string_t *result, + triton_status_t status) +{ + char *s = NULL; + + switch (status) + { + case TRITON_STATUS_PROTO: + s = "PROTO"; + break; + case TRITON_STATUS_NOMINAL: + s ="NOMINAL"; + break; + case TRITON_STATUS_RECOVERY: + s = "RECOVERY"; + break; + case TRITON_STATUS_MAINTENANCE: + s = "MAINTENANCE"; + break; + case TRITON_STATUS_FAILED: + s = "FAILED"; + break; + } + + if (s == NULL) + return TRITON_ERR_INVAL; + + triton_string_init(result, s); + return TRITON_SUCCESS; +} + +/* + * Local variables: + * mode: c + * c-indent-level: 4 + * c-basic-offset: 4 + * End: + * + * vim: ts=8 sts=4 sw=4 expandtab + */ diff --git a/code/src/state/state.hae b/code/src/state/state.hae index 1b0633b..4c74e68 100644 --- a/code/src/state/state.hae +++ b/code/src/state/state.hae @@ -99,6 +99,9 @@ typedef enum extern triton_status_t triton_status; +triton_ret_t triton_status_tostring(const triton_string_t *result, + triton_status_t status); + #endif /* diff --git a/code/src/state/test/module.mk.in b/code/src/state/test/module.mk.in index 6537103..6c0b478 100644 --- a/code/src/state/test/module.mk.in +++ b/code/src/state/test/module.mk.in @@ -18,6 +18,7 @@ STATE_TEST_SRC += $(DIR)/rosd-start.ae STATE_TEST_SRC += $(DIR)/rosd-global.ae STATE_TEST_SRC += $(DIR)/rosd-status.ae STATE_TEST_SRC += $(DIR)/rosd-trigger.ae +STATE_TEST_SRC += $(DIR)/rosd-peers.ae # AETESTSRC += $(DIR)/state-client.ae STATE_TESTS = $(patsubst %.ae,%,$(STATE_TEST_SRC)) @@ -90,3 +91,10 @@ MODCFLAGS_$(DIR)/rosd-trigger = $(MPICFLAGS) \ MODLDFLAGS_$(DIR)/rosd-trigger = $(MPILDFLAGS) MODLIBS_$(DIR)/rosd-trigger = $(MPILIBS) MODCC_$(DIR)/rosd-trigger = $(MPICC) + +MODCFLAGS_$(DIR)/rosd-peers = $(MPICFLAGS) \ + -D ROSD_DISABLE_FAKESS=$(ROSD_DISABLE_FAKESS) \ + -Wunused-variable +MODLDFLAGS_$(DIR)/rosd-peers = $(MPILDFLAGS) +MODLIBS_$(DIR)/rosd-peers = $(MPILIBS) +MODCC_$(DIR)/rosd-peers = $(MPICC) diff --git a/code/src/state/test/rosd-trigger.ae b/code/src/state/test/rosd-peers.ae similarity index 81% copy from code/src/state/test/rosd-trigger.ae copy to code/src/state/test/rosd-peers.ae index b5bace5..3c18cb6 100644 --- a/code/src/state/test/rosd-trigger.ae +++ b/code/src/state/test/rosd-peers.ae @@ -1,6 +1,7 @@ /** - Let ROSD servers read a global state variable + Let ROSD servers wait for a change to a state variable from + multiple peers */ #include <sys/types.h> @@ -45,6 +46,10 @@ #define SVR_POLL_TIMEOUT 1000 #define CLIENT_POLL_TIMEOUT 1000 +#define CANCEL while(aesop_count_branches() > 1) { \ + aesop_cancel_branches(); \ + triton_timer(2); } + int nobjects = 0; int nconcurrent = 0; char db_path[PATH_MAX]; @@ -57,14 +62,14 @@ char *hostfile; int mpi_rank; -__blocking void update_global() +__blocking void update_state() { - triton_timer(1000); + triton_timer(3000); triton_string_t key; triton_node_t self; triton_status_t *status; - printf("update_global()\n"); + printf("update_state()\n"); self = triton_map_self(); triton_status = TRITON_STATUS_MAINTENANCE; @@ -77,20 +82,51 @@ __blocking void update_global() return; } -__blocking void listen_global() +void handle_status_change(triton_node_t node, + triton_status_t *status_current, + triton_status_t *status_previous); + +void handle_status_change(triton_node_t node, + triton_status_t *status_current, + triton_status_t *status_previous) +{ + char node_string[128]; + triton_string_t status_string_current; + triton_string_t status_string_previous; + + triton_uint128_to_string(node_string, 128, node); + triton_status_tostring(&status_string_current, *status_current); + triton_status_tostring(&status_string_previous, *status_previous); + + printf("handle status change: node: %s from: %s to: %s\n", + node_string, + triton_string_get(&status_string_previous), + triton_string_get(&status_string_current)); + triton_string_destroy(&status_string_current); + triton_string_destroy(&status_string_previous); + + *status_previous = *status_current; +} + +__blocking void monitor_state() { triton_string_t key; triton_state_data_t *data; triton_node_t self; + triton_list_t *map; + triton_map_t *entry; + triton_map_t *scratch; + triton_node_t peer; triton_status_t *status; triton_ret_t ret; + bool running; - printf("listen_global()\n"); + printf("monitor_state()\n"); + triton_map_get(&map); self = triton_map_self(); triton_string_init(&key, "triton.state"); triton_fakess_item_add(self, &key); - printf("added item\n"); status = malloc(sizeof(triton_status_t)); *status = triton_status; @@ -98,17 +134,59 @@ __blocking void listen_global() status, sizeof(triton_status_t)); triton_error_assert(ret); - data = triton_fakess_lookup(self, &key); - assert(data); - - if (mpi_rank == 0) + /* wait for all nodes to post status=NOMINAL */ + triton_timer(1000); + + pwait { - printf("waiting for update...\n"); - triton_mutex_lock(&data->mutex); - triton_sched_wait(data->sched, &data->mutex); - triton_mutex_unlock(&data->mutex); + pprivate triton_ret_t pret; + pprivate triton_status_t peer_status = TRITON_STATUS_PROTO; + pprivate triton_status_t peer_status_previous = TRITON_STATUS_PROTO; + triton_list_for_each_entry (entry, scratch, map, + triton_map_t, link) + { + pbranch + { + peer = entry->node; + data = triton_fakess_lookup(peer, &key); + assert(data); + + while (true) + { + triton_mutex_lock(&data->mutex); + peer_status = *(triton_status_t *)(data->value); + if (peer_status == peer_status_previous) + { + pret = triton_sched_wait(data->sched, + &data->mutex); + } + triton_mutex_unlock(&data->mutex); + + peer_status = *(triton_status_t *)(data->value); + if (peer_status != peer_status_previous) + { + handle_status_change(peer, &peer_status, + &peer_status_previous); + } + + /* this seems necessary to catch the CANCEL */ + pret = triton_timer(100); + if (pret != TRITON_SUCCESS) + { + break; + } + } + } + } + pbranch + { + while (triton_fakess_running()) + { + triton_timer(1000); + } + CANCEL; + } } - printf("status: %i\n", *(int *)(data->value)); triton_string_destroy(&key); return; @@ -162,15 +240,12 @@ __blocking void do_remote_server(void) } pbranch { - if (mpi_rank == 0) - { - update_global(); - } + update_state(); } pbranch { triton_status = TRITON_STATUS_NOMINAL; - listen_global(); + monitor_state(); } } } @@ -423,7 +498,7 @@ int main(int argc, char *argv[]) /* clients */ /* wait a little bit to make sure the server gets started */ - sleep(3); + sleep(5); /* barrier and start noop test */ done = 0; @@ -483,9 +558,8 @@ int main(int argc, char *argv[]) /* * Local variables: - * mode: c - * c-indent-level: 4 - * c-basic-offset: 4 + * mode: c + * c-basic-offset: 4 * End: * * vim: ts=8 sts=4 sw=4 expandtab diff --git a/code/src/state/test/rosd-trigger.ae b/code/src/state/test/rosd-trigger.ae index b5bace5..c904aee 100644 --- a/code/src/state/test/rosd-trigger.ae +++ b/code/src/state/test/rosd-trigger.ae @@ -1,6 +1,6 @@ /** - Let ROSD servers read a global state variable + Let ROSD servers wait for a change to a state variable */ #include <sys/types.h> hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. d5effcad48eea23cb4ca1395511d975571d6949a
by noreply＠mcs.anl.gov 29 Mar '11

29 Mar '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 d5effcad48eea23cb4ca1395511d975571d6949a (commit) from f1b266c02c422dd33896d0c7b4b1a1f3c678a6de (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 d5effcad48eea23cb4ca1395511d975571d6949a Author: slang <slang(a)mcs.anl.gov> Date: Tue Mar 29 13:32:05 2011 -0500 client server init function, needs to be tested ----------------------------------------------------------------------- Summary of changes: .../{client-server.aer => client-server-exec.ae} | 19 +++++++++---------- .../{client-server.hae => client-server-exec.hae} | 5 ++--- 2 files changed, 11 insertions(+), 13 deletions(-) copy code/src/remote/{client-server.aer => client-server-exec.ae} (87%) copy code/src/remote/{client-server.hae => client-server-exec.hae} (85%) Diff of changes: diff --git a/code/src/remote/client-server.aer b/code/src/remote/client-server-exec.ae similarity index 87% copy from code/src/remote/client-server.aer copy to code/src/remote/client-server-exec.ae index c7e468e..48a079a 100644 --- a/code/src/remote/client-server.aer +++ b/code/src/remote/client-server-exec.ae @@ -1,17 +1,16 @@ -#include <mpi.h> - #include "src/remote/client-server.hae" #include "src/net/triton-addr.h" #include "src/net/mpi/mpi.h" +#include "mpi.h" #include "src/remote/message.hae" #include "src/remote/service.hae" -#if 0 -#include "src/remote/client-server-shutdown.haer" -#endif -#include "src/remote/client_server_shutdown_module.h" -#include "src/remote/client_server_shutdown_stubs.hae" +/* get generated client function for doing RPC shutdown */ +#include "src/remote/core_stubs.hae" + +/* get generate function for registering RPC shutdown into server */ +#include "src/remote/core_module.h" __blocking triton_ret_t triton_client_server( __blocking triton_ret_t (*client_init)(aer_remote_ctx_t rctx, triton_addr_t you), @@ -71,7 +70,7 @@ __blocking triton_ret_t triton_client_server( triton_string_destroy(&addrstr); triton_error_assert(sret); - sret = remote_triton_server_shutdown(AER_DEFAULT_CTX, shutdown_addr, 0, &out); + sret = remote_triton_core_server_shutdown(AER_DEFAULT_CTX, shutdown_addr, 0, &out); triton_error_assert(sret); } } @@ -83,8 +82,8 @@ __blocking triton_ret_t triton_client_server( { if(server_init) { - /* register shutdown rpc */ - tret = aer_remote_register_client_server_shutdown(); + /* register core rpc */ + tret = aer_remote_register_core(); triton_error_assert(tret); /* call server init */ diff --git a/code/src/remote/client-server.hae b/code/src/remote/client-server-exec.hae similarity index 85% copy from code/src/remote/client-server.hae copy to code/src/remote/client-server-exec.hae index c1eb95a..2961f4e 100644 --- a/code/src/remote/client-server.hae +++ b/code/src/remote/client-server-exec.hae @@ -1,6 +1,5 @@ - -#ifndef __CLIENT_SERVER_HAE__ -#define __CLIENT_SERVER_HAE__ +#ifndef __CLIENT_SERVER_EXEC_HAE__ +#define __CLIENT_SERVER_EXEC_HAE__ #include "src/aesop/aesop.h" #include "src/remote/message.hae" hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. f1b266c02c422dd33896d0c7b4b1a1f3c678a6de
by noreply＠mcs.anl.gov 29 Mar '11

29 Mar '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 f1b266c02c422dd33896d0c7b4b1a1f3c678a6de (commit) from 3e2623610381ff845b564dcda3dd240eba28f6f6 (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 f1b266c02c422dd33896d0c7b4b1a1f3c678a6de Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 10:49:14 2011 -0500 ROSD state variable single trigger case ----------------------------------------------------------------------- Summary of changes: code/src/state/test/module.mk.in | 8 ++++ .../state/test/{rosd-status.ae => rosd-trigger.ae} | 41 +++++++++---------- 2 files changed, 27 insertions(+), 22 deletions(-) copy code/src/state/test/{rosd-status.ae => rosd-trigger.ae} (95%) Diff of changes: diff --git a/code/src/state/test/module.mk.in b/code/src/state/test/module.mk.in index 617c108..6537103 100644 --- a/code/src/state/test/module.mk.in +++ b/code/src/state/test/module.mk.in @@ -17,6 +17,7 @@ STATE_TEST_SRC += $(DIR)/rpc-list.ae STATE_TEST_SRC += $(DIR)/rosd-start.ae STATE_TEST_SRC += $(DIR)/rosd-global.ae STATE_TEST_SRC += $(DIR)/rosd-status.ae +STATE_TEST_SRC += $(DIR)/rosd-trigger.ae # AETESTSRC += $(DIR)/state-client.ae STATE_TESTS = $(patsubst %.ae,%,$(STATE_TEST_SRC)) @@ -82,3 +83,10 @@ MODCFLAGS_$(DIR)/rosd-status = $(MPICFLAGS) \ MODLDFLAGS_$(DIR)/rosd-status = $(MPILDFLAGS) MODLIBS_$(DIR)/rosd-status = $(MPILIBS) MODCC_$(DIR)/rosd-status = $(MPICC) + +MODCFLAGS_$(DIR)/rosd-trigger = $(MPICFLAGS) \ + -D ROSD_DISABLE_FAKESS=$(ROSD_DISABLE_FAKESS) \ + -Wunused-variable +MODLDFLAGS_$(DIR)/rosd-trigger = $(MPILDFLAGS) +MODLIBS_$(DIR)/rosd-trigger = $(MPILIBS) +MODCC_$(DIR)/rosd-trigger = $(MPICC) diff --git a/code/src/state/test/rosd-status.ae b/code/src/state/test/rosd-trigger.ae similarity index 95% copy from code/src/state/test/rosd-status.ae copy to code/src/state/test/rosd-trigger.ae index 338dab0..b5bace5 100644 --- a/code/src/state/test/rosd-status.ae +++ b/code/src/state/test/rosd-trigger.ae @@ -55,6 +55,8 @@ int nservers = 0; int replication_factor = 0; char *hostfile; +int mpi_rank; + __blocking void update_global() { triton_timer(1000); @@ -96,18 +98,19 @@ __blocking void listen_global() status, sizeof(triton_status_t)); triton_error_assert(ret); - printf("posted\n"); - - triton_timer(2000); - - printf("listening...\n"); - data = triton_fakess_lookup(self, &key); + assert(data); + if (mpi_rank == 0) + { + printf("waiting for update...\n"); + triton_mutex_lock(&data->mutex); + triton_sched_wait(data->sched, &data->mutex); + triton_mutex_unlock(&data->mutex); + } printf("status: %i\n", *(int *)(data->value)); triton_string_destroy(&key); - return; } @@ -126,11 +129,9 @@ __blocking void do_remote_server(void) { triton_ret_t ret; int32_t result; - int rank; uint128_t oid; int nprocs; - MPI_Comm_rank(MPI_COMM_WORLD, &rank); MPI_Comm_size(MPI_COMM_WORLD, &nprocs); assert(nprocs > 1); @@ -161,7 +162,7 @@ __blocking void do_remote_server(void) } pbranch { - if (rank == 0) + if (mpi_rank == 0) { update_global(); } @@ -208,12 +209,9 @@ __blocking void do_remote_noop(void) { triton_ret_t ret; int32_t result; - int rank; uint128_t oid; uint32_t flags = 0; - MPI_Comm_rank(MPI_COMM_WORLD, &rank); - /* NOTE: noop doesn't really need an oid to operate on, but we use one * anyway for mapping purposes so that we talk to the same servers that * we would have had this been a real rosd operation @@ -221,7 +219,7 @@ __blocking void do_remote_noop(void) /* TODO: clean this up; I'm cheating for convenience... */ oid = triton_uint128_from_uint64(0); - oid.u += rank; + oid.u += mpi_rank; pwait { @@ -276,7 +274,6 @@ int main(int argc, char *argv[]) triton_ret_t ret; ae_op_id_t op_id; ae_hints_t hints; - int rank; int mpi_ret; MPI_Group orig_group, client_group; MPI_Comm client_comm; @@ -291,7 +288,7 @@ int main(int argc, char *argv[]) mpi_ret = MPI_Init_thread(NULL, NULL, MPI_THREAD_MULTIPLE, &provided); assert(mpi_ret == MPI_SUCCESS); - MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); /* parse command line */ if(argc != 10) @@ -347,12 +344,12 @@ int main(int argc, char *argv[]) hostfile = argv[9]; - if(rank < nservers) + if(mpi_rank < nservers) { /* tack on the rank number to the paths to avoid conflicts when * running two svrs on one box */ - sprintf(rank_suffix, "%d", rank); + sprintf(rank_suffix, "%d", mpi_rank); strcat(log_path, rank_suffix); ret = triton_zeroconf_set("triton.vosd.data_path", log_path); @@ -405,7 +402,7 @@ int main(int argc, char *argv[]) mpi_ret = MPI_Comm_create(MPI_COMM_WORLD, client_group, &client_comm); assert(mpi_ret == MPI_SUCCESS); - if(rank < nservers) + if(mpi_rank < nservers) { /* servers */ @@ -432,7 +429,7 @@ int main(int argc, char *argv[]) done = 0; mpi_ret = MPI_Barrier(client_comm); assert(mpi_ret == MPI_SUCCESS); - if(rank == nservers) + if(mpi_rank == nservers) { printf("# starting noop test.\n"); } @@ -450,13 +447,13 @@ int main(int argc, char *argv[]) noop_elapsed = test_end - test_start; } - if(rank >= nservers) + if(mpi_rank >= nservers) { MPI_Allreduce(&noop_elapsed, &noop_elapsed_time, 1, MPI_DOUBLE, MPI_MAX, client_comm); MPI_Allreduce(&noop_elapsed, &noop_min_elapsed_time, 1, MPI_DOUBLE, MPI_MIN, client_comm); - if(rank == nservers) + if(mpi_rank == nservers) { printf("# remove test done.\n"); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 3e2623610381ff845b564dcda3dd240eba28f6f6
by noreply＠mcs.anl.gov 29 Mar '11

29 Mar '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 3e2623610381ff845b564dcda3dd240eba28f6f6 (commit) via 07513c40fadd3621e7b1f812ee39a1554d4c3973 (commit) via 9313cf14b06e22eac1c86f7fdbff9d260c775d72 (commit) via 524f09efac632bfdd6a3e5acbaa7e0eac3f7a478 (commit) via ab6e8d48c0873577aaeb42c783b4fab573cecadb (commit) via 9da0373f71e6466f959f4b0db0dde999e4967c08 (commit) via 4a33654aa320b793575792655d7d6e50daee29df (commit) from 5ce4aa95a28b84bae63ca7865a7368e709b3673d (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 3e2623610381ff845b564dcda3dd240eba28f6f6 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 10:21:54 2011 -0500 Initial test to pass triton_status variable among ROSDs commit 07513c40fadd3621e7b1f812ee39a1554d4c3973 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 10:21:40 2011 -0500 Whitespace commit 9313cf14b06e22eac1c86f7fdbff9d260c775d72 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Tue Mar 29 10:18:39 2011 -0500 Handle fakess not found case commit 524f09efac632bfdd6a3e5acbaa7e0eac3f7a478 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Mar 28 22:31:08 2011 -0500 Fix prefixes commit ab6e8d48c0873577aaeb42c783b4fab573cecadb Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Mar 28 22:12:16 2011 -0500 Set prefix commit 9da0373f71e6466f959f4b0db0dde999e4967c08 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Mar 28 22:06:07 2011 -0500 Add enum triton_state_t commit 4a33654aa320b793575792655d7d6e50daee29df Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Mar 28 21:58:13 2011 -0500 Update footer ----------------------------------------------------------------------- Summary of changes: code/src/fakess/fakess.ae | 9 ++- code/src/state/state.ae | 2 + code/src/state/state.hae | 17 +++++ code/src/state/test/module.mk.in | 16 ++++- code/src/state/test/rosd-global.ae | 18 +++--- .../state/test/{rosd-global.ae => rosd-status.ae} | 62 ++++++++++++++------ 6 files changed, 89 insertions(+), 35 deletions(-) copy code/src/state/test/{rosd-global.ae => rosd-status.ae} (90%) Diff of changes: diff --git a/code/src/fakess/fakess.ae b/code/src/fakess/fakess.ae index 7db4680..996aa8b 100644 --- a/code/src/fakess/fakess.ae +++ b/code/src/fakess/fakess.ae @@ -175,7 +175,7 @@ static triton_state_data_t *lookup_data (struct triton_state_table *state, triton_string_t *key); /** - Lookup a data item + Lookup a data item or NULL if not found */ triton_state_data_t *triton_fakess_lookup(triton_node_t node, triton_string_t *key) @@ -195,6 +195,9 @@ triton_state_data_t *triton_fakess_lookup(triton_node_t node, */ state = lookup_node(node); + if (state == NULL) + return NULL; + data = lookup_data(state, key); return data; } @@ -740,7 +743,7 @@ bool triton_fakess_running() return fakess_running; } -/** +/** Fake state propagation time (milliseconds) For fakess, always 1000ms @return result in time @@ -794,7 +797,7 @@ __attribute__((constructor)) void triton_fakess_init_register(void); __attribute__((constructor)) void triton_fakess_init_register(void) { /* TODO: lose dep on MPI here */ - triton_init_register("triton.fakess", + triton_init_register("triton.fakess", triton_fakess_init, triton_fakess_finalize, NULL, "triton.net.message", "triton.net.mpi"); } diff --git a/code/src/state/state.ae b/code/src/state/state.ae index 32ec126..7785a8f 100644 --- a/code/src/state/state.ae +++ b/code/src/state/state.ae @@ -2,3 +2,5 @@ #include "src/state/state.hae" struct triton_state_funcs triton_state; + +triton_status_t triton_status = TRITON_STATUS_PROTO; diff --git a/code/src/state/state.hae b/code/src/state/state.hae index ec1a9b4..1b0633b 100644 --- a/code/src/state/state.hae +++ b/code/src/state/state.hae @@ -83,10 +83,27 @@ struct triton_state_funcs extern struct triton_state_funcs triton_state; +typedef enum +{ + /** The node is joining the system */ + TRITON_STATUS_PROTO, + /** The node is healthy */ + TRITON_STATUS_NOMINAL, + /** The node is recovering metadata from neighbors */ + TRITON_STATUS_RECOVERY, + /** The node is unable to serve requests */ + TRITON_STATUS_MAINTENANCE, + /** The node is out of the system */ + TRITON_STATUS_FAILED +} triton_status_t; + +extern triton_status_t triton_status; + #endif /* * Local variables: + * mode: c * c-indent-level: 4 * c-basic-offset: 4 * End: diff --git a/code/src/state/test/module.mk.in b/code/src/state/test/module.mk.in index e93a3fc..617c108 100644 --- a/code/src/state/test/module.mk.in +++ b/code/src/state/test/module.mk.in @@ -16,6 +16,7 @@ STATE_TEST_SRC += $(DIR)/rpc-global.ae STATE_TEST_SRC += $(DIR)/rpc-list.ae STATE_TEST_SRC += $(DIR)/rosd-start.ae STATE_TEST_SRC += $(DIR)/rosd-global.ae +STATE_TEST_SRC += $(DIR)/rosd-status.ae # AETESTSRC += $(DIR)/state-client.ae STATE_TESTS = $(patsubst %.ae,%,$(STATE_TEST_SRC)) @@ -63,14 +64,21 @@ MODCC_$(DIR)/engine1 = $(MPICC) MODCFLAGS_$(DIR)/rosd-start = $(MPICFLAGS) \ -D ROSD_DISABLE_FAKESS=$(ROSD_DISABLE_FAKESS) \ - -Wunused-variable + -Wunused-variable MODLDFLAGS_$(DIR)/rosd-start = $(MPILDFLAGS) MODLIBS_$(DIR)/rosd-01 = $(MPILIBS) MODCC_$(DIR)/rosd-01 = $(MPICC) MODCFLAGS_$(DIR)/rosd-global = $(MPICFLAGS) \ -D ROSD_DISABLE_FAKESS=$(ROSD_DISABLE_FAKESS) \ - -Wunused-variable + -Wunused-variable MODLDFLAGS_$(DIR)/rosd-global = $(MPILDFLAGS) -MODLIBS_$(DIR)/rosd-01 = $(MPILIBS) -MODCC_$(DIR)/rosd-01 = $(MPICC) +MODLIBS_$(DIR)/rosd-global = $(MPILIBS) +MODCC_$(DIR)/rosd-global = $(MPICC) + +MODCFLAGS_$(DIR)/rosd-status = $(MPICFLAGS) \ + -D ROSD_DISABLE_FAKESS=$(ROSD_DISABLE_FAKESS) \ + -Wunused-variable +MODLDFLAGS_$(DIR)/rosd-status = $(MPILDFLAGS) +MODLIBS_$(DIR)/rosd-status = $(MPILIBS) +MODCC_$(DIR)/rosd-status = $(MPICC) diff --git a/code/src/state/test/rosd-global.ae b/code/src/state/test/rosd-global.ae index 5304fcd..9802888 100644 --- a/code/src/state/test/rosd-global.ae +++ b/code/src/state/test/rosd-global.ae @@ -1,5 +1,5 @@ -/** +/** Let ROSD servers read a global state variable */ @@ -57,21 +57,21 @@ char *hostfile; __blocking void update_global() { triton_timer(1000); - triton_string_t key; + triton_string_t key; int *value; triton_string_init(&key, "KEY1"); value = malloc(sizeof(int)); *value = 23; printf("update_global()\n"); triton_fakess_post(triton_node_null, &key, value, sizeof(int)); - return; + return; } __blocking void listen_global() { - triton_string_t key; - int *value; - triton_state_data_t *data; + triton_string_t key; + int *value; + triton_state_data_t *data; triton_string_init(&key, "KEY1"); triton_fakess_item_add(triton_node_null, &key); @@ -80,12 +80,12 @@ __blocking void listen_global() printf("listen_global()\n"); data = triton_fakess_lookup(triton_node_null, &key); - value = data->value; + value = data->value; printf("value: %i\n", *value); triton_string_destroy(&key); - return; + return; } #if ROSD_DISABLE_FAKESS == 1 @@ -449,7 +449,7 @@ int main(int argc, char *argv[]) { ae_poll(NULL, CLIENT_POLL_TIMEOUT); } - ae_hints_destroy(&hints); + ae_hints_destroy(&hints); } } diff --git a/code/src/state/test/rosd-global.ae b/code/src/state/test/rosd-status.ae similarity index 90% copy from code/src/state/test/rosd-global.ae copy to code/src/state/test/rosd-status.ae index 5304fcd..338dab0 100644 --- a/code/src/state/test/rosd-global.ae +++ b/code/src/state/test/rosd-status.ae @@ -1,5 +1,5 @@ -/** +/** Let ROSD servers read a global state variable */ @@ -27,6 +27,7 @@ #include "src/mapping/mapping.hae" #include "src/fakess/fakess.hae" #include "src/placement/placement.hae" +#include "src/state/state.hae" #include "src/common/triton-init.h" #include "src/versioned-osd/prototype/versioned-osd.hae" @@ -57,35 +58,57 @@ char *hostfile; __blocking void update_global() { triton_timer(1000); - triton_string_t key; - int *value; - triton_string_init(&key, "KEY1"); - value = malloc(sizeof(int)); - *value = 23; + triton_string_t key; + triton_node_t self; + triton_status_t *status; + printf("update_global()\n"); - triton_fakess_post(triton_node_null, &key, value, sizeof(int)); - return; + self = triton_map_self(); + triton_status = TRITON_STATUS_MAINTENANCE; + + triton_string_init(&key, "triton.state"); + status = malloc(sizeof(triton_status_t)); + *status = triton_status; + triton_fakess_post(self, &key, status, sizeof(triton_status_t)); + + triton_string_destroy(&key); + return; } __blocking void listen_global() { - triton_string_t key; - int *value; - triton_state_data_t *data; - triton_string_init(&key, "KEY1"); - triton_fakess_item_add(triton_node_null, &key); + triton_string_t key; + triton_state_data_t *data; + triton_node_t self; + triton_status_t *status; + triton_ret_t ret; + + printf("listen_global()\n"); + + self = triton_map_self(); + triton_string_init(&key, "triton.state"); + triton_fakess_item_add(self, &key); + printf("added item\n"); + + status = malloc(sizeof(triton_status_t)); + *status = triton_status; + ret = triton_fakess_post(self, &key, + status, sizeof(triton_status_t)); + triton_error_assert(ret); + + printf("posted\n"); triton_timer(2000); - printf("listen_global()\n"); + printf("listening...\n"); + + data = triton_fakess_lookup(self, &key); - data = triton_fakess_lookup(triton_node_null, &key); - value = data->value; - printf("value: %i\n", *value); + printf("status: %i\n", *(int *)(data->value)); triton_string_destroy(&key); - return; + return; } #if ROSD_DISABLE_FAKESS == 1 @@ -145,6 +168,7 @@ __blocking void do_remote_server(void) } pbranch { + triton_status = TRITON_STATUS_NOMINAL; listen_global(); } } @@ -449,7 +473,7 @@ int main(int argc, char *argv[]) { ae_poll(NULL, CLIENT_POLL_TIMEOUT); } - ae_hints_destroy(&hints); + ae_hints_destroy(&hints); } } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 5ce4aa95a28b84bae63ca7865a7368e709b3673d
by noreply＠mcs.anl.gov 28 Mar '11

28 Mar '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 5ce4aa95a28b84bae63ca7865a7368e709b3673d (commit) via b0139557b6a1554deec644ede356450b923b3495 (commit) via 84bdf2cedc2b732ec63ae4727b20c32b5d6becbf (commit) via 3d545b2900849017584adce1c662d06654b3bd34 (commit) via eebdb66710fa9a190f57421230bf511104502cff (commit) via 579c1e0e2ad868ca4ed80d8ea7a561ebb18a540b (commit) via 0ab99eeee0dd941706e20a7de3b97b498dd0cf1d (commit) via fb59042a35f71d17712458021fe12e23bf605ca7 (commit) from 2f5bc9bf833f8ad63d3aef09940cd221c824eaf3 (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 5ce4aa95a28b84bae63ca7865a7368e709b3673d Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Mar 28 17:52:05 2011 -0500 Have state.propagation() return an int(milliseconds) commit b0139557b6a1554deec644ede356450b923b3495 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Mar 28 17:13:25 2011 -0500 Install fakess propagation and fix warning on "time" (ref #66) commit 84bdf2cedc2b732ec63ae4727b20c32b5d6becbf Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Mar 28 17:12:59 2011 -0500 Add propagation to system state interface commit 3d545b2900849017584adce1c662d06654b3bd34 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Mar 28 17:06:51 2011 -0500 fakess propagation time (ref #66) commit eebdb66710fa9a190f57421230bf511104502cff Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Mar 28 17:02:05 2011 -0500 Drop unnecessary data structures commit 579c1e0e2ad868ca4ed80d8ea7a561ebb18a540b Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Mar 28 16:47:06 2011 -0500 Correct module name commit 0ab99eeee0dd941706e20a7de3b97b498dd0cf1d Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Mar 28 16:45:55 2011 -0500 Revert "Minor improvement to fakess use of triton_init" This reverts commit e15e5f6c7760656f29c1fcc479e40e99aaa94b68. commit fb59042a35f71d17712458021fe12e23bf605ca7 Author: Justin Wozniak <wozniak(a)mcs.anl.gov> Date: Mon Mar 28 16:45:00 2011 -0500 Minor improvement to fakess use of triton_init ----------------------------------------------------------------------- Summary of changes: code/src/fakess/fakess.ae | 41 +++++++++++++++++++++++++------------- code/src/fakess/fakess.hae | 25 +--------------------- code/src/state/state-client.aer | 8 +++++++ code/src/state/state.hae | 2 + 4 files changed, 39 insertions(+), 37 deletions(-) Diff of changes: diff --git a/code/src/fakess/fakess.ae b/code/src/fakess/fakess.ae index aa4d0e9..7db4680 100644 --- a/code/src/fakess/fakess.ae +++ b/code/src/fakess/fakess.ae @@ -26,7 +26,7 @@ struct triton_hash_table *fakess_nodes; /** - List of known nodes (list of triton_peer_t) + List of known nodes (list of triton_state_peer_t) */ static triton_list_t triton_fakess_peers; @@ -116,7 +116,7 @@ triton_ret_t triton_fakess_node_add(triton_node_t node); triton_ret_t triton_fakess_init(void) { triton_ret_t result; - triton_fakess_peer_t *peer; + triton_state_peer_t *peer; triton_string_t s; // triton_debug_add_mask("triton.fakess.xyz", &debug); @@ -165,6 +165,7 @@ __blocking void triton_fakess_state_install(void) triton_state.engine_start = triton_fakess_engine_start; triton_state.engine_stop = triton_fakess_engine_stop; triton_state.running = triton_fakess_running; + triton_state.propagation = triton_fakess_propagation; triton_state.shutdown = triton_fakess_shutdown; triton_state.finalize = triton_fakess_finalize; } @@ -241,9 +242,9 @@ static void state_add(triton_node_t node) static void peer_add(triton_node_t node) { - triton_fakess_peer_t *peer; + triton_state_peer_t *peer; - peer = malloc(sizeof(triton_fakess_peer_t)); + peer = malloc(sizeof(triton_state_peer_t)); peer->node = node; triton_list_link_clear(&peer->link); @@ -396,8 +397,8 @@ __blocking void triton_fakess_broadcast(triton_msg_tag_t tag, char *buffer, uint32_t length) { - triton_fakess_peer_t *peer; - triton_fakess_peer_t *scratch; + triton_state_peer_t *peer; + triton_state_peer_t *scratch; triton_addr_t addr; triton_node_t self; @@ -407,7 +408,7 @@ __blocking void triton_fakess_broadcast(triton_msg_tag_t tag, self = triton_map_self(); triton_list_for_each_entry(peer, scratch, &triton_fakess_peers, - triton_fakess_peer_t, link) + triton_state_peer_t, link) { if (triton_cmp_node(peer->node, triton_node_null) && triton_cmp_node(peer->node, self)) @@ -625,14 +626,14 @@ __blocking triton_ret_t triton_fakess_recv() */ triton_ret_t triton_fakess_list(triton_node_t *list) { - triton_fakess_peer_t *peer; - triton_fakess_peer_t *scratch; + triton_state_peer_t *peer; + triton_state_peer_t *scratch; int i; i = 0; triton_list_for_each_entry(peer, scratch, &triton_fakess_peers, - triton_fakess_peer_t, link) + triton_state_peer_t, link) { if (triton_cmp_node(peer->node, triton_node_null)) { @@ -739,6 +740,17 @@ bool triton_fakess_running() return fakess_running; } +/** + Fake state propagation time (milliseconds) + For fakess, always 1000ms + @return result in time +*/ +triton_ret_t triton_fakess_propagation(int *result_time) +{ + *result_time = 1000; + return(TRITON_SUCCESS); +} + static void data_destroy(triton_state_data_t *data) { triton_mutex_destroy(&data->mutex); @@ -752,7 +764,7 @@ static void data_destroy(triton_state_data_t *data) void triton_fakess_finalize(void) { struct triton_state_table *state; - triton_fakess_peer_t *peer; + triton_state_peer_t *peer; triton_list_link_t *p; @@ -760,7 +772,7 @@ void triton_fakess_finalize(void) while ((p = triton_queue_dequeue(&triton_fakess_peers)) != NULL) { - peer = triton_list_get_entry(p, triton_fakess_peer_t, link); + peer = triton_list_get_entry(p, triton_state_peer_t, link); state = lookup_node(peer->node); triton_hash_destroy_and_finalize(state->table, @@ -778,11 +790,12 @@ void triton_fakess_finalize(void) __attribute__((constructor)) void triton_fakess_init_register(void); -/* still need to register placement component so that we fulfill deps in rosd */ +/* still need to register fakess component so that we fulfill deps in rosd */ __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_init_register("triton.fakess", + triton_fakess_init, triton_fakess_finalize, NULL, "triton.net.message", "triton.net.mpi"); } diff --git a/code/src/fakess/fakess.hae b/code/src/fakess/fakess.hae index ec70667..412eb21 100644 --- a/code/src/fakess/fakess.hae +++ b/code/src/fakess/fakess.hae @@ -23,29 +23,6 @@ #define TRITON_FAKESS_UNSET ((void *)1) -/** - The data items stored in the fakess state tables. -*/ -/* -typedef struct -{ - triton_string_t key; - void *value; - triton_mutex_t mutex; - triton_sched_t sched; - struct triton_hash_link link; -} triton_fakess_data_t; -*/ - -/** - @deprecated - Use hostlist_entry -*/ -typedef struct -{ - triton_node_t node; - struct triton_list_link link; -} triton_fakess_peer_t; - __blocking triton_ret_t triton_fakess_init_self(void); __blocking void triton_fakess_state_install(void); @@ -94,6 +71,8 @@ triton_ret_t triton_fakess_engine_stop(void); bool triton_fakess_running(void); +triton_ret_t triton_fakess_propagation(int *result_time); + __blocking triton_ret_t triton_fakess_shutdown(void); triton_ret_t triton_fakess_init(void); diff --git a/code/src/state/state-client.aer b/code/src/state/state-client.aer index 1df5df1..e9b2b59 100644 --- a/code/src/state/state-client.aer +++ b/code/src/state/state-client.aer @@ -121,6 +121,14 @@ __remote __blocking triton_ret_t state_client_lookup( return TRITON_SUCCESS; } +__remote __blocking triton_ret_t state_client_propagation( + int32_t *in_nothing, + int32_t *out_time) +{ + triton_state.propagation(out_time); + return TRITON_SUCCESS; +} + /* * Local variables: * mode: c diff --git a/code/src/state/state.hae b/code/src/state/state.hae index ce0a7c1..ec1a9b4 100644 --- a/code/src/state/state.hae +++ b/code/src/state/state.hae @@ -74,6 +74,8 @@ struct triton_state_funcs bool (*running)(void); + triton_ret_t (*propagation)(int *time); + __blocking triton_ret_t (*shutdown)(void); void (*finalize)(void); hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 2f5bc9bf833f8ad63d3aef09940cd221c824eaf3
by noreply＠mcs.anl.gov 28 Mar '11

28 Mar '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 2f5bc9bf833f8ad63d3aef09940cd221c824eaf3 (commit) from c9747a726547dbace440b5963e464727503caf3a (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 2f5bc9bf833f8ad63d3aef09940cd221c824eaf3 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Mar 28 17:41:09 2011 -0400 allow aesop_main_set() to use default context ----------------------------------------------------------------------- Summary of changes: code/src/aesop/resource.h | 23 +++++++++++++------ .../prototype/tests/vosd-multi-object.ae | 13 +++++++++- 2 files changed, 27 insertions(+), 9 deletions(-) Diff of changes: diff --git a/code/src/aesop/resource.h b/code/src/aesop/resource.h index a756443..74b60fd 100644 --- a/code/src/aesop/resource.h +++ b/code/src/aesop/resource.h @@ -235,14 +235,16 @@ static void __main_cb(void *user_ptr, int t) \ } \ int main(int argc, char **argv) \ { \ - ae_context_t __main_ctx; \ + ae_context_t __main_ctx = NULL; \ ae_hints_t __main_hints; \ ae_op_id_t __main_opid; \ triton_ret_t ret; \ ret = triton_init(); \ triton_error_assert(ret); \ - ret = ae_context_create(&__main_ctx, __VA_ARGS__); \ - triton_error_assert(ret); \ + if(COUNT_ARGS(__VA_ARGS__) > 0){ \ + ret = ae_context_create(&__main_ctx, ##__VA_ARGS__); \ + triton_error_assert(ret); \ + } \ ret = ae_hints_init(&__main_hints); \ ret = ae_post_blocking(__main_blocking_function__, __main_cb, NULL, &__main_hints, __main_ctx, &__main_opid, argc, argv); \ triton_error_assert(ret); \ @@ -253,7 +255,9 @@ int main(int argc, char **argv) \ triton_error_assert(ret); \ } \ ae_hints_destroy(&__main_hints); \ - ae_context_destroy(__main_ctx); \ + if(COUNT_ARGS(__VA_ARGS__) > 0){ \ + ae_context_destroy(__main_ctx); \ + } \ triton_finalize(); \ return __main_ret; \ } @@ -280,7 +284,7 @@ static void __main_cb(void *user_ptr, int t) \ } \ int main(int argc, char **argv) \ { \ - ae_context_t __main_ctx; \ + ae_context_t __main_ctx = NULL; \ ae_hints_t __main_hints; \ ae_op_id_t __main_opid; \ triton_ret_t ret; \ @@ -292,7 +296,10 @@ int main(int argc, char **argv) \ } \ ret = triton_init(__init_module__); \ triton_error_assert(ret); \ - ret = ae_context_create(&__main_ctx, __VA_ARGS__); \ + if(COUNT_ARGS(__VA_ARGS__) > 0){ \ + ret = ae_context_create(&__main_ctx, ##__VA_ARGS__); \ + triton_error_assert(ret); \ + } \ triton_error_assert(ret); \ ret = ae_hints_init(&__main_hints); \ ret = ae_post_blocking( \ @@ -312,7 +319,9 @@ int main(int argc, char **argv) \ triton_error_assert(ret); \ } \ ae_hints_destroy(&__main_hints); \ - ae_context_destroy(__main_ctx); \ + if(COUNT_ARGS(__VA_ARGS__) > 0){ \ + ae_context_destroy(__main_ctx); \ + } \ triton_finalize(); \ return __main_ret; \ } diff --git a/code/src/versioned-osd/prototype/tests/vosd-multi-object.ae b/code/src/versioned-osd/prototype/tests/vosd-multi-object.ae index 8d19cdc..cd30fc0 100644 --- a/code/src/versioned-osd/prototype/tests/vosd-multi-object.ae +++ b/code/src/versioned-osd/prototype/tests/vosd-multi-object.ae @@ -121,10 +121,19 @@ static triton_ret_t init_vosd_zeroconf_params(int argc, char** argv) return triton_zeroconf_set("triton.vosd.data_path", "/tmp/vosd/data"); } +/* NOTE: as an alternative, the following syntax could be used to make this + * benchmark create a new context that specifically drives the bdb, file, + * and sched resources. Instead we are using it as an example of a test + * program that uses the default context, by not specifying any resources. + */ +/* aesop_main_set_with_init(init_vosd_zeroconf_params, + * "triton.vosd", + * do_vosd_test, + * "bdb", "file","sched"); + */ aesop_main_set_with_init(init_vosd_zeroconf_params, "triton.vosd", - do_vosd_test, - "bdb", "file", "sched"); + do_vosd_test); /* * Local variables: hooks/post-receive -- Triton Repository

1 0