January 2013 - Triton-commits - mailman3.cels.anl.gov

branch, ticket-227, updated. f2e459d28d3992f68b89eca4c90c439c39db8dfc
by noreply＠mcs.anl.gov 29 Jan '13

29 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, ticket-227 has been updated via f2e459d28d3992f68b89eca4c90c439c39db8dfc (commit) from 8da4c851bf2d9be83e09dab747faf60c30bcb388 (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 f2e459d28d3992f68b89eca4c90c439c39db8dfc Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Jan 29 15:15:38 2013 -0500 clean up tosd fd cache remove function ----------------------------------------------------------------------- Summary of changes: code/src/transactional-osd/tosd-fd-cache.ae | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) Diff of changes: diff --git a/code/src/transactional-osd/tosd-fd-cache.ae b/code/src/transactional-osd/tosd-fd-cache.ae index bf5036e..d212b70 100644 --- a/code/src/transactional-osd/tosd-fd-cache.ae +++ b/code/src/transactional-osd/tosd-fd-cache.ae @@ -198,6 +198,9 @@ __blocking void fd_cache_remove(uint128_t oid) /* get rid of the fd cache entry */ triton_list_del(&tmp_entry->unused_link); triton_list_del(&tmp_entry->hash_link); + hash_count--; + triton_mutex_unlock(&fd_mutex); + ret = aefile_close(tmp_entry->fd); if(ret != 0) { @@ -206,18 +209,18 @@ __blocking void fd_cache_remove(uint128_t oid) } triton_mutex_destroy(&tmp_entry->log_offset_mutex); free(tmp_entry); - hash_count--; + } + else + { + triton_mutex_unlock(&fd_mutex); } /* actually unlink the log file */ triton_uint128_to_string(oid_str, TRITON_UINT128_STRLEN, oid); sprintf(log_name, "%s/%s.dat", fd_cache_cosd_log_path, oid_str); - /* TODO: this should be a resource function, and should be done without - * a lock held - */ - unlink(log_name); - triton_mutex_unlock(&fd_mutex); + aefile_unlink(log_name); + return; } hooks/post-receive --

1 0

branch, ticket-227, updated. 8da4c851bf2d9be83e09dab747faf60c30bcb388
by noreply＠mcs.anl.gov 28 Jan '13

28 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, ticket-227 has been updated via 8da4c851bf2d9be83e09dab747faf60c30bcb388 (commit) via 8104e98dabb8a930d14cecec29b7d6055684f142 (commit) from 1e2b102b0648b5c84b3251cc98d99a1052cb4cd3 (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 8da4c851bf2d9be83e09dab747faf60c30bcb388 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Jan 28 10:56:17 2013 -0500 remove debugging assertion commit 8104e98dabb8a930d14cecec29b7d6055684f142 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Jan 28 10:54:49 2013 -0500 fix triton_buffer_t encoding bug - the encoder and decoder for triton_buffer_t did not match; it was encoding 32 bit values on the sender side and decoding 64 bit values on receiving side, eventually resulting in memory corruption ----------------------------------------------------------------------- Summary of changes: code/src/remote/encoding-pw.h | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) Diff of changes: diff --git a/code/src/remote/encoding-pw.h b/code/src/remote/encoding-pw.h index acd8777..ab4e8ef 100644 --- a/code/src/remote/encoding-pw.h +++ b/code/src/remote/encoding-pw.h @@ -890,8 +890,8 @@ static inline triton_ret_t aer_decode_triton_buffer_t( triton_buffer_t *buffer, char **n __unused__, void *x) { triton_ret_t ret; - uint64_t size = 0; - uint64_t offset = 0; + uint32_t size = 0; + uint32_t offset = 0; char dbg_buffer[DBG_SIZE]; int i; @@ -900,13 +900,13 @@ static inline triton_ret_t aer_decode_triton_buffer_t( triton_debug(encoding_dbg_mask, "decoding:triton_buffer_t\tcptr=%p",triton_buffer_cptr(buffer)); - ret = aer_decode_uint64_t(buffer, NULL, &size); + ret = aer_decode_uint32_t(buffer, NULL, &size); if(ret != TRITON_SUCCESS) { return ret; } - ret = aer_decode_uint64_t(buffer, NULL, &offset); + ret = aer_decode_uint32_t(buffer, NULL, &offset); if(ret != TRITON_SUCCESS) { return ret; @@ -933,8 +933,6 @@ static inline triton_ret_t aer_decode_triton_buffer_t( * copy. This is a workaround. We make a full deep copy of the buffer * instead. It is wasteful in terms of memory usage, but safer. */ - /* TODO: temporary safety check while tracking down a bug */ - assert(size < (4*1024*1024)); ret = triton_buffer_alloc(ctbuffer(x), size); if(ret != TRITON_SUCCESS) { hooks/post-receive --

1 0

branch, ticket-227, updated. 1e2b102b0648b5c84b3251cc98d99a1052cb4cd3
by noreply＠mcs.anl.gov 28 Jan '13

28 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, ticket-227 has been updated via 1e2b102b0648b5c84b3251cc98d99a1052cb4cd3 (commit) from d2f45a287d6fb132fd25abb61c35e5de5776c55e (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 1e2b102b0648b5c84b3251cc98d99a1052cb4cd3 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Jan 28 10:45:51 2013 -0500 fix previous commit ----------------------------------------------------------------------- Summary of changes: code/src/remote/encoding-pw.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/remote/encoding-pw.h b/code/src/remote/encoding-pw.h index 8d4317b..acd8777 100644 --- a/code/src/remote/encoding-pw.h +++ b/code/src/remote/encoding-pw.h @@ -934,7 +934,7 @@ static inline triton_ret_t aer_decode_triton_buffer_t( * instead. It is wasteful in terms of memory usage, but safer. */ /* TODO: temporary safety check while tracking down a bug */ - assert(size > -1 && size < (4*1024*1024)); + assert(size < (4*1024*1024)); ret = triton_buffer_alloc(ctbuffer(x), size); if(ret != TRITON_SUCCESS) { hooks/post-receive --

1 0

branch, ticket-227, updated. d2f45a287d6fb132fd25abb61c35e5de5776c55e
by noreply＠mcs.anl.gov 28 Jan '13

28 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, ticket-227 has been updated via d2f45a287d6fb132fd25abb61c35e5de5776c55e (commit) from d2c4357e74c72c1cb7965bb9f2cf96bf2fa7c433 (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 d2f45a287d6fb132fd25abb61c35e5de5776c55e Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Jan 28 10:20:14 2013 -0500 sanity check buffer allocation arguments ----------------------------------------------------------------------- Summary of changes: code/src/remote/encoding-pw.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/remote/encoding-pw.h b/code/src/remote/encoding-pw.h index e802183..8d4317b 100644 --- a/code/src/remote/encoding-pw.h +++ b/code/src/remote/encoding-pw.h @@ -933,6 +933,8 @@ static inline triton_ret_t aer_decode_triton_buffer_t( * copy. This is a workaround. We make a full deep copy of the buffer * instead. It is wasteful in terms of memory usage, but safer. */ + /* TODO: temporary safety check while tracking down a bug */ + assert(size > -1 && size < (4*1024*1024)); ret = triton_buffer_alloc(ctbuffer(x), size); if(ret != TRITON_SUCCESS) { hooks/post-receive --

1 0

branch, ticket-227, updated. d2c4357e74c72c1cb7965bb9f2cf96bf2fa7c433
by noreply＠mcs.anl.gov 28 Jan '13

28 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, ticket-227 has been updated via d2c4357e74c72c1cb7965bb9f2cf96bf2fa7c433 (commit) from 265711f640df6b034dc5dc667b019fb02b8e1a85 (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 d2c4357e74c72c1cb7965bb9f2cf96bf2fa7c433 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Jan 28 09:43:48 2013 -0500 avoid holding mutex across resource calls in tosd ----------------------------------------------------------------------- Summary of changes: code/src/transactional-osd/tosd-fd-cache.ae | 109 ++++++++++++++++++++------- 1 files changed, 80 insertions(+), 29 deletions(-) Diff of changes: diff --git a/code/src/transactional-osd/tosd-fd-cache.ae b/code/src/transactional-osd/tosd-fd-cache.ae index c2793d5..bf5036e 100644 --- a/code/src/transactional-osd/tosd-fd-cache.ae +++ b/code/src/transactional-osd/tosd-fd-cache.ae @@ -39,9 +39,14 @@ static __blocking void fd_cache_purge_internal(int watermark) int ret; struct stat statbuf; char oid_str[TRITON_UINT128_STRLEN]; + triton_list_t purge_list; - /* go through unused list and close files until we get below the - * watermark again + triton_list_init(&purge_list); + + triton_mutex_lock(&fd_mutex); + + /* go through unused list and move to a local list to be purged while we + * hold the lock */ triton_list_for_each(iterator, scratch, &unused_list) { @@ -50,6 +55,24 @@ static __blocking void fd_cache_purge_internal(int watermark) assert(dead_entry->ref_count == 0); triton_list_del(&dead_entry->unused_link); triton_list_del(&dead_entry->hash_link); + triton_list_add_back(&dead_entry->unused_link, &purge_list); + + hash_count--; + if(hash_count < watermark) + break; + } + triton_mutex_unlock(&fd_mutex); + + /* now go through the local purge list and close the files in question, + * no need to hold lock here. + */ + triton_list_for_each(iterator, scratch, &purge_list) + { + dead_entry = triton_list_get_entry(iterator, struct fd_cache_entry, + unused_link); + triton_list_del(&dead_entry->unused_link); + assert(dead_entry->ref_count == 0); + ret = aefile_fstat(dead_entry->fd, &statbuf); if(ret == 0) { @@ -87,11 +110,9 @@ static __blocking void fd_cache_purge_internal(int watermark) triton_mutex_destroy(&dead_entry->log_offset_mutex); free(dead_entry); - hash_count--; - - if(hash_count < watermark) - break; } + + triton_list_destroy(&purge_list); return; } @@ -191,7 +212,9 @@ __blocking void fd_cache_remove(uint128_t oid) /* actually unlink the log file */ triton_uint128_to_string(oid_str, TRITON_UINT128_STRLEN, oid); sprintf(log_name, "%s/%s.dat", fd_cache_cosd_log_path, oid_str); - /* TODO: this should be a resource function */ + /* TODO: this should be a resource function, and should be done without + * a lock held + */ unlink(log_name); triton_mutex_unlock(&fd_mutex); @@ -202,6 +225,7 @@ __blocking triton_ret_t fd_cache_get(struct fd_cache_entry **entry, uint128_t oi { struct triton_hash_link* tmp_link; struct fd_cache_entry* tmp_entry; + struct fd_cache_entry* new_entry; char log_name [PATH_MAX]; int posix_open_flags = O_RDWR|O_CREAT; char oid_str[TRITON_UINT128_STRLEN]; @@ -231,14 +255,15 @@ __blocking triton_ret_t fd_cache_get(struct fd_cache_entry **entry, uint128_t oi *entry = tmp_entry; return(TRITON_SUCCESS); } + triton_mutex_unlock(&fd_mutex); /* don't know about this one yet */ - tmp_entry = malloc(sizeof(*tmp_entry)); - memset(tmp_entry, 0, sizeof(*tmp_entry)); - triton_mutex_init(&tmp_entry->log_offset_mutex, NULL); + new_entry = malloc(sizeof(*new_entry)); + memset(new_entry, 0, sizeof(*new_entry)); + triton_mutex_init(&new_entry->log_offset_mutex, NULL); - tmp_entry->oid = oid; - tmp_entry->ref_count = 1; + new_entry->oid = oid; + new_entry->ref_count = 1; if(flags & TOSD_INIT_FLAG_DATA_ODIRECT) #ifdef HAVE_ODIRECT @@ -264,13 +289,12 @@ __blocking triton_ret_t fd_cache_get(struct fd_cache_entry **entry, uint128_t oi * again, etc.) */ } - triton_mutex_destroy(&tmp_entry->log_offset_mutex); - free(tmp_entry); - triton_mutex_unlock(&fd_mutex); + triton_mutex_destroy(&new_entry->log_offset_mutex); + free(new_entry); triton_crit(triton_log_default, "Failed to open %s\n", log_name); return(triton_error_from_errno(-rc)); } - tmp_entry->fd = rc; + new_entry->fd = rc; /* use the current size as the next log offset */ /* NOTE: this is safe. If the file was closed gracefully, we @@ -278,27 +302,57 @@ __blocking triton_ret_t fd_cache_get(struct fd_cache_entry **entry, uint128_t oi * we are protected by the fact that the write txn doesn't close until * after data is written. */ - rc = aefile_fstat(tmp_entry->fd, &statbuf); + rc = aefile_fstat(new_entry->fd, &statbuf); if(rc != 0) { triton_crit(triton_log_default, - "Error on fstat of fd %d.\n", tmp_entry->fd); - rc_tmp = close(tmp_entry->fd); + "Error on fstat of fd %d.\n", new_entry->fd); + rc_tmp = close(new_entry->fd); if(rc_tmp != 0) { triton_crit(triton_log_default, - "Error closing fd %d, continuing.\n", tmp_entry->fd); + "Error closing fd %d, continuing.\n", new_entry->fd); } - triton_mutex_destroy(&tmp_entry->log_offset_mutex); - free(tmp_entry); - triton_mutex_unlock(&fd_mutex); + triton_mutex_destroy(&new_entry->log_offset_mutex); + free(new_entry); return(triton_error_from_errno(-rc)); } assert((statbuf.st_size % alignment) == 0); - tmp_entry->log_offset = statbuf.st_size; + new_entry->log_offset = statbuf.st_size; + + /* check for race condition; someone else may have also opened this file + * while we were trying to + */ + triton_mutex_lock(&fd_mutex); + + tmp_link = triton_hash_search(oid_table, &oid); + if(tmp_link) + { + /* we already have it open */ + + /* get rid of new entry */ + triton_mutex_destroy(&new_entry->log_offset_mutex); + close(new_entry->fd); + free(new_entry); + + /* use entry that's already in the cache */ + tmp_entry = triton_list_get_entry(tmp_link, struct fd_cache_entry, + hash_link); + if(tmp_entry->ref_count == 0) + { + assert(tmp_entry->unused_link.prev); + triton_list_del(&tmp_entry->unused_link); + } + tmp_entry->ref_count++; + triton_mutex_unlock(&fd_mutex); + *entry = tmp_entry; + return(TRITON_SUCCESS); + } - triton_hash_add(oid_table, &oid, &tmp_entry->hash_link); + /* this is the first appearance of this fd in the cache; add it */ + triton_hash_add(oid_table, &oid, &new_entry->hash_link); hash_count++; + triton_mutex_unlock(&fd_mutex); /* do we have too many objects open now? */ if(hash_count > OPEN_WATERMARK) @@ -306,8 +360,7 @@ __blocking triton_ret_t fd_cache_get(struct fd_cache_entry **entry, uint128_t oi fd_cache_purge_internal(OPEN_WATERMARK); } - triton_mutex_unlock(&fd_mutex); - *entry = tmp_entry; + *entry = new_entry; return(TRITON_SUCCESS); } @@ -393,9 +446,7 @@ static void fd_cache_destructor(struct fd_cache_entry* entry) __blocking void fd_cache_purge(void) { - triton_mutex_lock(&fd_mutex); fd_cache_purge_internal(0); - triton_mutex_unlock(&fd_mutex); } hooks/post-receive --

1 0

branch, ticket-227, updated. 265711f640df6b034dc5dc667b019fb02b8e1a85
by noreply＠mcs.anl.gov 18 Jan '13

18 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, ticket-227 has been updated via 265711f640df6b034dc5dc667b019fb02b8e1a85 (commit) from b366ae945af8c0d9f14d8d42bd96092d1372ba8f (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 265711f640df6b034dc5dc667b019fb02b8e1a85 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Jan 18 12:25:37 2013 -0500 workaround fix for decoding of triton_buffer_t - Don't shallow copy triton_buffer_t fields in rpc structs. For now we deep copy instead because of triton_buffer_t bugs in handling destruction of shallow copies. ----------------------------------------------------------------------- Summary of changes: code/src/remote/encoding-pw.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/remote/encoding-pw.h b/code/src/remote/encoding-pw.h index ab0f1e8..e802183 100644 --- a/code/src/remote/encoding-pw.h +++ b/code/src/remote/encoding-pw.h @@ -912,6 +912,7 @@ static inline triton_ret_t aer_decode_triton_buffer_t( return ret; } +#if 0 /* make a (shallow) copy of the buffer being decoded so we get true zero-copy here. * This should setup refcounting, so that we things are destroyed properly. */ @@ -926,6 +927,20 @@ static inline triton_ret_t aer_decode_triton_buffer_t( /* set the actual buffer pointer into the message buffer at the right offset */ ctbuffer(x)->buffer = triton_buffer_cptr(buffer) + offset - aer_encode_size_uint32_t(NULL, &offset); +#else + /* NOTE: the above code is buggy. If the original input buffer is + * destroyed, then the caller cannot safely keep (and free) its shallow + * copy. This is a workaround. We make a full deep copy of the buffer + * instead. It is wasteful in terms of memory usage, but safer. + */ + ret = triton_buffer_alloc(ctbuffer(x), size); + if(ret != TRITON_SUCCESS) + { + return ret; + } + memcpy(ctbuffer(x)->buffer, triton_buffer_cptr(buffer) + offset - aer_encode_size_uint32_t(NULL, &offset), size); + +#endif for(i=0; i<DBG_SIZE; i++) dbg_buffer[i] = size > i ? ctbuffer(x)->buffer[i] : 0; hooks/post-receive --

1 0

branch, ticket-227, updated. b366ae945af8c0d9f14d8d42bd96092d1372ba8f
by noreply＠mcs.anl.gov 17 Jan '13

17 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, ticket-227 has been updated via b366ae945af8c0d9f14d8d42bd96092d1372ba8f (commit) from fe15e0eff88fe4eb866436ba66f3feb99ba94b89 (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 b366ae945af8c0d9f14d8d42bd96092d1372ba8f Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jan 17 15:27:17 2013 -0500 revert previous commit - This is making things worse (on the server side). Need to think about this some more. ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/rosd.aer | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) Diff of changes: diff --git a/code/src/replicated-osd/rosd.aer b/code/src/replicated-osd/rosd.aer index c2c601b..c289c24 100644 --- a/code/src/replicated-osd/rosd.aer +++ b/code/src/replicated-osd/rosd.aer @@ -916,8 +916,6 @@ __remote __blocking triton_ret_t rosd_read( uint32_t replication_factor; int my_position; triton_addr_t peer_addr; - triton_buffer_t buf; - uint64_t version; stime = Wtime(); @@ -960,31 +958,29 @@ __remote __blocking triton_ret_t rosd_read( * response struct). If we don't return TRITON_SUCCESS, then it is * this function's responsibility to clean it up. */ - tret = triton_buffer_alloc(&buf, req->size); + tret = triton_buffer_alloc(&resp->buffer, req->size); if(tret != TRITON_SUCCESS) { traffic_cop_rpc_svc_end(id); return(tret); } - - mem_offsets[0] = buf.buffer; + mem_offsets[0] = resp->buffer.buffer; tret = tosd_read_versioned(req->oid, req->oid_fork, mem_offsets, &req->size, 1, - &req->offset, &req->size, 1, &out_size, 0, &version); + &req->offset, &req->size, 1, &out_size, 0, &resp->version); if(triton_error_equal(tret, TRITON_SUCCESS)) { /* may have been a short read, so we set the size here */ - /* TODO: is there a cleaner way to do this? */ - buf.size = out_size; - buf.alloc_size = out_size; - aer_init_struct_rosd_read_resp(resp, &buf, &version); + resp->buffer.size = out_size; + resp->buffer.alloc_size = out_size; + } + else + { + /* see earlier comment, in this case we have to clean up the buffer + * we allocated + */ + triton_buffer_destroy(&resp->buffer); } - - /* it is safe to destroy the local buffer here; if it was used in the - * response then aer_init_struct_rosd_read_resp() will have incremented - * the reference count accordingly - */ - triton_buffer_destroy(&buf); traffic_cop_rpc_svc_end(id); etime = Wtime(); hooks/post-receive --

1 0

branch, ticket-227, updated. fe15e0eff88fe4eb866436ba66f3feb99ba94b89
by noreply＠mcs.anl.gov 17 Jan '13

17 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, ticket-227 has been updated via fe15e0eff88fe4eb866436ba66f3feb99ba94b89 (commit) from 26d0d79250922978de785ebf4f7de78a60bafe7c (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 fe15e0eff88fe4eb866436ba66f3feb99ba94b89 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Jan 17 14:49:59 2013 -0500 use aer init functions in rosd_read response ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/rosd.aer | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) Diff of changes: diff --git a/code/src/replicated-osd/rosd.aer b/code/src/replicated-osd/rosd.aer index c289c24..c2c601b 100644 --- a/code/src/replicated-osd/rosd.aer +++ b/code/src/replicated-osd/rosd.aer @@ -916,6 +916,8 @@ __remote __blocking triton_ret_t rosd_read( uint32_t replication_factor; int my_position; triton_addr_t peer_addr; + triton_buffer_t buf; + uint64_t version; stime = Wtime(); @@ -958,30 +960,32 @@ __remote __blocking triton_ret_t rosd_read( * response struct). If we don't return TRITON_SUCCESS, then it is * this function's responsibility to clean it up. */ - tret = triton_buffer_alloc(&resp->buffer, req->size); + tret = triton_buffer_alloc(&buf, req->size); if(tret != TRITON_SUCCESS) { traffic_cop_rpc_svc_end(id); return(tret); } - mem_offsets[0] = resp->buffer.buffer; + + mem_offsets[0] = buf.buffer; tret = tosd_read_versioned(req->oid, req->oid_fork, mem_offsets, &req->size, 1, - &req->offset, &req->size, 1, &out_size, 0, &resp->version); + &req->offset, &req->size, 1, &out_size, 0, &version); if(triton_error_equal(tret, TRITON_SUCCESS)) { /* may have been a short read, so we set the size here */ - resp->buffer.size = out_size; - resp->buffer.alloc_size = out_size; - } - else - { - /* see earlier comment, in this case we have to clean up the buffer - * we allocated - */ - triton_buffer_destroy(&resp->buffer); + /* TODO: is there a cleaner way to do this? */ + buf.size = out_size; + buf.alloc_size = out_size; + aer_init_struct_rosd_read_resp(resp, &buf, &version); } + /* it is safe to destroy the local buffer here; if it was used in the + * response then aer_init_struct_rosd_read_resp() will have incremented + * the reference count accordingly + */ + triton_buffer_destroy(&buf); + traffic_cop_rpc_svc_end(id); etime = Wtime(); read_time += (etime-stime); hooks/post-receive --

1 0

branch, ticket-227, updated. 26d0d79250922978de785ebf4f7de78a60bafe7c
by noreply＠mcs.anl.gov 11 Jan '13

11 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, ticket-227 has been updated via 26d0d79250922978de785ebf4f7de78a60bafe7c (commit) via d14be0a4b508f8b332ce8c39a8f045ced2d8c442 (commit) via 3ec6a6b4f85499c2068228acce5734bdfcf22e55 (commit) from 2a2127087a445e2490b2621ba8945c56551190ef (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 26d0d79250922978de785ebf4f7de78a60bafe7c Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Jan 11 17:24:11 2013 -0500 fix init ordering for rosd-create-bench commit d14be0a4b508f8b332ce8c39a8f045ced2d8c442 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Jan 11 17:23:40 2013 -0500 allow zeroconf values to be set before register commit 3ec6a6b4f85499c2068228acce5734bdfcf22e55 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Jan 11 16:56:29 2013 -0500 minor mutex fix ----------------------------------------------------------------------- Summary of changes: code/src/common/resources/signal/signal.c | 1 + code/src/replicated-osd/rosd-test-harness.ae | 3 ++ code/src/replicated-osd/tests/rosd-create-bench.ae | 29 +++++++++++--------- code/src/zeroconf/zeroconf.c | 13 +++------ 4 files changed, 24 insertions(+), 22 deletions(-) Diff of changes: diff --git a/code/src/common/resources/signal/signal.c b/code/src/common/resources/signal/signal.c index b892a93..80381fa 100644 --- a/code/src/common/resources/signal/signal.c +++ b/code/src/common/resources/signal/signal.c @@ -456,6 +456,7 @@ triton_ret_t triton_signal_init (void) &signal_opcache); if (tret != TRITON_SUCCESS) { + triton_mutex_unlock (&signal_refcount_mutex); return tret; } diff --git a/code/src/replicated-osd/rosd-test-harness.ae b/code/src/replicated-osd/rosd-test-harness.ae index f3b2c80..a7a4d4b 100644 --- a/code/src/replicated-osd/rosd-test-harness.ae +++ b/code/src/replicated-osd/rosd-test-harness.ae @@ -522,6 +522,9 @@ __blocking triton_ret_t rosd_test_harness_server_fn(int nservers, int nclients, /* will exit when it gets a shutdown request from a client */ + triton_signal_finalize(); + triton_map_finalize(); + triton_state_finalize(); rosd_finalize(); return(TRITON_SUCCESS); diff --git a/code/src/replicated-osd/tests/rosd-create-bench.ae b/code/src/replicated-osd/tests/rosd-create-bench.ae index cb1dfec..0453925 100644 --- a/code/src/replicated-osd/tests/rosd-create-bench.ae +++ b/code/src/replicated-osd/tests/rosd-create-bench.ae @@ -62,6 +62,18 @@ int main(int argc, char *argv[]) return(-1); } + /* start up triton */ + /* NOTE: we have to do this outside of the client_fn() to make sure that + * the triton_launch_client_server() function can issue shutdown rpcs. + */ + ret = retry_method_init(); + triton_error_assert(ret); + ret = triton_state_init(); + triton_error_assert(ret); + ret = triton_map_init(); + triton_error_assert(ret); + triton_signal_init(); + ae_hints_init(&hints); ae_ret = ae_post_blocking(triton_launch_client_server, cb, NULL, &hints, NULL, &op_id, &main_tret, options.nservers, &options, rosd_client_fn, rosd_test_harness_server_fn); if(ae_ret == AE_SUCCESS) @@ -77,11 +89,11 @@ int main(int argc, char *argv[]) if(main_tret != TRITON_SUCCESS) triton_error_print(main_tret, "Error: test failed."); - /* TODO: need to finalize a lot more stuff somewhere; this is a mess - * because of some init and finalize steps happening within the - * launch_client_server framework, and some not. - */ + triton_signal_finalize(); + triton_map_finalize(); + triton_state_finalize(); retry_method_finalize(); + MPI_Finalize(); return 0; @@ -102,15 +114,6 @@ static __blocking triton_ret_t rosd_client_fn(int nservers, int nclients, void* MPI_Comm_rank(client_comm, &client_rank); - /* start up triton */ - ret = retry_method_init(); - triton_error_assert(ret); - ret = triton_state_init(); - triton_error_assert(ret); - ret = triton_map_init(); - triton_error_assert(ret); - triton_signal_init(); - /* connect to storage system */ ret = triton_attach("mpi://0"); if(ret != TRITON_SUCCESS) diff --git a/code/src/zeroconf/zeroconf.c b/code/src/zeroconf/zeroconf.c index 75d6abf..8e65dcf 100644 --- a/code/src/zeroconf/zeroconf.c +++ b/code/src/zeroconf/zeroconf.c @@ -122,15 +122,15 @@ const char * triton_zeroconf_get(const char *key) triton_ret_t triton_zeroconf_set(const char *key, const char *value) { triton_ret_t ret = TRITON_SUCCESS; - struct triton_hash_link *link; + struct triton_hash_link *link = NULL; struct zc_entry *zce; struct pre_init_entry* pi_entry; triton_mutex_lock(&module_lock); - if(!module_refcount) + if(!module_refcount || !(link = triton_hash_search(zeroconf_table, key))) { - /* zeroconf has not been started yet; queue up this key/value pair - * to be processed later + /* Either zeroconf has not been started or this key hasn't been + * registered yet. Either way we queue it up to be processed later. */ pi_entry = malloc(sizeof(*pi_entry)); if(!pi_entry) @@ -160,11 +160,6 @@ triton_ret_t triton_zeroconf_set(const char *key, const char *value) } triton_mutex_unlock(&module_lock); - link = triton_hash_search(zeroconf_table, key); - if(!link) - { - return TRITON_ERR_NOENT; - } zce = triton_hash_get_entry(link, struct zc_entry, link); free(zce->kv.value); zce->kv.value = strdup(value); hooks/post-receive --

1 0

branch, ticket-227, updated. 2a2127087a445e2490b2621ba8945c56551190ef
by noreply＠mcs.anl.gov 11 Jan '13

11 Jan '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, ticket-227 has been updated via 2a2127087a445e2490b2621ba8945c56551190ef (commit) from 98b7041fe37b6f4487c5341fd54ff804d6bb996e (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 2a2127087a445e2490b2621ba8945c56551190ef Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Jan 11 15:19:17 2013 -0500 bug fix to ae function usage in tosd ----------------------------------------------------------------------- Summary of changes: code/src/transactional-osd/transactional-osd.ae | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Diff of changes: diff --git a/code/src/transactional-osd/transactional-osd.ae b/code/src/transactional-osd/transactional-osd.ae index aea2f3e..22b9cd6 100644 --- a/code/src/transactional-osd/transactional-osd.ae +++ b/code/src/transactional-osd/transactional-osd.ae @@ -286,10 +286,10 @@ static __blocking triton_ret_t check_niid(DB_TXN* txn, uint128_t oid, uint64_t n /* disable niid checks if the caller hasn't set a retry hint */ retry_count = 0; } - else if(tret != TRITON_SUCCESS) + else if(ae_ret != AE_SUCCESS) { - triton_log_error(triton_log_default, tret, "aesop_hints_get()"); - return(tret); + triton_log_error(triton_log_default, TRITON_ERR_UNKNOWN, "aesop_hints_get()"); + return(TRITON_ERR_UNKNOWN); } if(retry_count == 0) hooks/post-receive --

1 0