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

Triton Repository branch, master, updated. 4493d84025240016fcba45f70263c48c10a0298d
by noreply＠mcs.anl.gov 21 Feb '11

21 Feb '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 4493d84025240016fcba45f70263c48c10a0298d (commit) via 266e40246af839b91f5d0dc0c049f0c375e25f38 (commit) via 495bd35f7de150695bd28947c62fdd74a9868cc1 (commit) via 9c63c455a117c3f33c3b339e79551f6fa3b98156 (commit) via ddabd1a4f14af64f101c231a36fa268435a12e8a (commit) from 39184121d296857d6ae222bfb9aae0b2fa5aa4a9 (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 4493d84025240016fcba45f70263c48c10a0298d Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Feb 21 17:27:13 2011 -0500 first cut at I/O benchmark in vosd_autotune commit 266e40246af839b91f5d0dc0c049f0c375e25f38 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Feb 21 16:14:21 2011 -0500 change default bdb flush thread mode commit 495bd35f7de150695bd28947c62fdd74a9868cc1 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Feb 21 16:09:23 2011 -0500 more autotuning, thread modes, and bug fixes commit 9c63c455a117c3f33c3b339e79551f6fa3b98156 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Feb 21 14:52:23 2011 -0500 first steps in vosd autotuning (create/rm bench) commit ddabd1a4f14af64f101c231a36fa268435a12e8a Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Feb 21 14:49:09 2011 -0500 change default txn progress mode ----------------------------------------------------------------------- Summary of changes: code/src/common/triton-hash.h | 2 +- .../prototype/bdb-resource/bdb-resource.c | 18 ++- code/src/versioned-osd/prototype/versioned-osd.ae | 266 ++++++++++++++++++-- 3 files changed, 261 insertions(+), 25 deletions(-) Diff of changes: diff --git a/code/src/common/triton-hash.h b/code/src/common/triton-hash.h index f8a8feb..69db9f2 100644 --- a/code/src/common/triton-hash.h +++ b/code/src/common/triton-hash.h @@ -376,7 +376,7 @@ static inline int triton_hash_string_hash(const void *k, int table_size) static inline int triton_hash_ptr_hash(const void *k, int table_size) { uint32_t pc = 0, pb = 0; - bj_hashlittle2(k, sizeof(k), &pc, &pb); + bj_hashlittle2(&k, sizeof(k), &pc, &pb); return pc & (table_size - 1); } diff --git a/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c b/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c index a4f4e45..b816e9e 100644 --- a/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c +++ b/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c @@ -293,6 +293,13 @@ static triton_ret_t bdb_launch_op(struct ae_op *op, enum bdb_progress_mode mode, break; case TRITON_BDB_PROG_THREAD_PER_TXN: triton_mutex_lock(&bdb_mutex); + if(txn == NULL) + { + /* if no txn, then set pointer to 1 to avoid safety checks + * in triton_hash + */ + txn = (DB_TXN*)1; + } tmp_link = triton_hash_search(txn_thread_table, txn); if(!tmp_link) { @@ -428,7 +435,7 @@ triton_ret_t bdb_init(void) } ret = triton_zeroconf_register(txn_progress_mode_confkey, - "THREAD_PER_OP", progress_mode_updater, + "THREAD_PER_TXN", progress_mode_updater, "Progress mode for BDB transactions (THREAD_PER_OP or THREAD_PER_TXN"); if(ret != TRITON_SUCCESS && ret != TRITON_ERR_EXIST) { @@ -436,8 +443,8 @@ triton_ret_t bdb_init(void) } ret = triton_zeroconf_register(flush_progress_mode_confkey, - "THREAD_PER_OP", progress_mode_updater, - "Progress mode for flushing BDB data (IN_PLACE, POLL, or THREAD_PER_OP"); + "ONE_THREAD", progress_mode_updater, + "Progress mode for flushing BDB data (IN_PLACE, POLL, THREAD_PER_OP, or ONE_THREAD"); if(ret != TRITON_SUCCESS && ret != TRITON_ERR_EXIST) { return(ret); @@ -1085,6 +1092,9 @@ static triton_ret_t progress_mode_updater(const char *key, const char *value) else return(TRITON_ERR_INVAL); } + /* NOTE: ONE_THREAD mode for flush operations gets translated into + * THREAD_PER_TXN on a NULL txn + */ else if(!strcmp(key, flush_progress_mode_confkey)) { if(!strcmp(value, "IN_PLACE")) @@ -1093,6 +1103,8 @@ static triton_ret_t progress_mode_updater(const char *key, const char *value) flush_progress_mode = TRITON_BDB_PROG_POLL; else if(!strcmp(value, "THREAD_PER_OP")) flush_progress_mode = TRITON_BDB_PROG_THREAD_PER_OP; + else if(!strcmp(value, "ONE_THREAD")) + flush_progress_mode = TRITON_BDB_PROG_THREAD_PER_TXN; else return(TRITON_ERR_INVAL); } diff --git a/code/src/versioned-osd/prototype/versioned-osd.ae b/code/src/versioned-osd/prototype/versioned-osd.ae index 6b29350..94eefdc 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.ae +++ b/code/src/versioned-osd/prototype/versioned-osd.ae @@ -16,6 +16,7 @@ #include "src/common/triton-base.h" #include "src/aesop/aesop.h" #include "src/common/triton-hash.h" +#include "src/common/resources/timer/timer.hae" #include "src/versioned-osd/prototype/bdb-resource/bdb-resource.hae" #include "src/versioned-osd/prototype/file-resource/file-resource.hae" #include "src/versioned-osd/prototype/versioned-osd.hae" @@ -1739,7 +1740,7 @@ void vosd_finalize(void) __attribute__((constructor)) void triton_vosd_init_register(void) { triton_init_register("triton.vosd", vosd_init, vosd_finalize, NULL, - "triton.resource.sched", "triton.vosd.bdb", "triton.vosd.file"); + "triton.resource.sched", "triton.vosd.bdb", "triton.vosd.file", "triton.resource.timer"); } #if 0 @@ -3381,6 +3382,30 @@ __blocking triton_ret_t vosd_check_niid(uint128_t oid, uint64_t niid, int op_typ return(tret); } +static __blocking triton_ret_t purge_niids_from_oid(uint64_t max, uint128_t oid) +{ + int i; + uint64_t niid; + triton_ret_t tret; + + for(i=1; i<=max; i++) + { + niid = i; + tret = vosd_discard_niids(&oid, &niid, 1); + /* TODO: why am I getting ENOENT on an niid here? */ + if(tret != TRITON_ERR_NOENT) + { + triton_error_assert(tret); + } + else + { + printf("Warning: hit ENOENT when purging niid: %llu\n", niid); + } + } + + return(TRITON_SUCCESS); +} + static __blocking triton_ret_t purge_niids(uint64_t max) { int i; @@ -3407,14 +3432,15 @@ static __blocking triton_ret_t purge_niids(uint64_t max) return(TRITON_SUCCESS); } -static __blocking triton_ret_t create_rm_bench(double seconds, double* ops_per_sec) +static __blocking triton_ret_t create_rm_bench(double seconds, + int concurrency, double* ops_per_sec) { - int concurrent = 32; int started = 0; triton_mutex_t started_mutex; double start_tm; double end_tm; double now; + triton_ret_t tret; triton_mutex_init(&started_mutex, NULL); @@ -3430,7 +3456,7 @@ static __blocking triton_ret_t create_rm_bench(double seconds, double* ops_per_s done = 0; started = 0; - for(i=0; i<concurrent; i++) + for(i=0; i<concurrency; i++) { pbranch { @@ -3470,49 +3496,247 @@ static __blocking triton_ret_t create_rm_bench(double seconds, double* ops_per_s /* get rid of any niids that were inserted by the benchmark */ purge_niids(started); + /* make sure that the txn log is flushed */ + tret = bdb_txn_checkpoint(envp, 0, 0, 0); + + return(TRITON_SUCCESS); +} + +static __blocking triton_ret_t write_bench(double seconds, + int concurrency, int op_size, double* ops_per_sec) +{ + int started = 0; + triton_mutex_t started_mutex; + double start_tm; + double end_tm; + double now; + triton_ret_t tret; + uint128_t oid; + int64_t offset = 0; + char* buffer; + int64_t buffer_size = op_size; + + buffer = malloc(op_size); + if(!buffer) + { + return(TRITON_ERR_NOMEM); + } + + oid = triton_uint128_from_uint64(0); + tret = vosd_create(oid, 0); + triton_error_assert(tret); + + triton_mutex_init(&started_mutex, NULL); + + start_tm = Wtime(); + pwait + { + pprivate int i; + pprivate triton_ret_t b_ret; + pprivate double now; + pprivate int done = 0; + pprivate uint64_t niid; + + done = 0; + started = 0; + for(i=0; i<concurrency; i++) + { + pbranch + { + while(!done) + { + triton_mutex_lock(&started_mutex); + now = Wtime(); + if(now - start_tm > seconds) + { + done = 1; + } + else + { + started++; + niid = started; + offset = i*op_size; + } + triton_mutex_unlock(&started_mutex); + + if(!done) + { + /* NOTE: using niid as txn number here */ + b_ret = vosd_write(oid, 0, niid, &buffer, &buffer_size, 1, &offset, &buffer_size, 1, VOSD_FLAG_AUTO_TXN, niid); + triton_error_assert(b_ret); + } + } + } + } + } + end_tm = Wtime(); + + *ops_per_sec = (double)started/(end_tm-start_tm); + + triton_mutex_destroy(&started_mutex); + + tret = vosd_remove(oid, 0); + triton_error_assert(tret); + + /* get rid of any niids that were inserted by the benchmark */ + purge_niids_from_oid(started, oid); + + /* make sure that the txn log is flushed */ + tret = bdb_txn_checkpoint(envp, 0, 0, 0); + + free(buffer); return(TRITON_SUCCESS); } + __blocking triton_ret_t vosd_autotune(void) { triton_ret_t tret; - double ops_per_sec; - double duration = 5.0; /* TODO: make this bigger */ + double ops_warmup, ops_thread_txn, ops_thread_op, ops_flush_thread_per_op; + double wr_warmup, wr1_default, wr1_no_threads, wr1_no_odirect; + double wr2_default, wr2_no_threads, wr2_no_odirect; + double duration = 20.0; + int concurrency = 32; + const char* value; + + /* check default settings; we want to have defaults when we start */ + value = triton_zeroconf_get( + "triton.bdb.txn_progress_mode"); + if(strcmp(value, "THREAD_PER_TXN") != 0) + { + fprintf(stderr, "Error: bdb not in default txn_progress_mode of THREAD_PER_TXN.\n"); + return(TRITON_ERR_INVAL); + } + + value = triton_zeroconf_get( + "triton.bdb.flush_progress_mode"); + if(strcmp(value, "ONE_THREAD") != 0) + { + fprintf(stderr, "Error: bdb not in default flush_progress_mode of THREAD_PER_OP.\n"); + return(TRITON_ERR_INVAL); + } + + value = triton_zeroconf_get( + "triton.file.io_progress_mode"); + if(strcmp(value, "THREAD_PER_OP") != 0) + { + fprintf(stderr, "Error: file not in default io_progress_mode of THREAD_PER_OP.\n"); + return(TRITON_ERR_INVAL); + } - /* benchmark with thread-per-txn */ + if(!(global_flags & VOSD_INIT_FLAG_DATA_ODIRECT)) + { + fprintf(stderr, "Error: VOSD not using default DATA_ODIRECT flag.\n"); + return(TRITON_ERR_INVAL); + } + + + printf("vosd_autotune: concurrent operations %d\n", concurrency); + printf("vosd_autotune: duration of each test: %f\n", duration); + printf("vosd_autotune: confirmed default settings:\n"); + printf(" bdb txns: THREAD_PER_TXN\n"); + printf(" bdb flushes: ONE_THREAD.\n"); + printf(" io: THREAD_PER_OP\n"); + printf(" io flags: O_DIRECT\n"); + + /* warm up run before real testing */ + printf("vosd_autotune: metadata warm up run...\n"); + tret = create_rm_bench(duration, concurrency, &ops_warmup); + triton_error_assert(tret); + printf("vosd_autotune: warm up done.\n"); + + triton_timer(1000); + + /* real test */ + printf("vosd_autotune: bdb: default settings ...\n"); + tret = create_rm_bench(duration, concurrency, &ops_thread_txn); + triton_error_assert(tret); + printf(" %f (creates+removes)/sec\n", ops_thread_txn); + + triton_timer(1000); + + /* switch to thread per op mode */ tret = triton_zeroconf_set( - "triton.bdb.txn_progress_mode", "THREAD_PER_TXN"); + "triton.bdb.txn_progress_mode", "THREAD_PER_OP"); triton_error_assert(tret); + + printf("vosd_autotune: bdb txns: THREAD_PER_OP ...\n"); + tret = create_rm_bench(duration, concurrency, &ops_thread_op); + triton_error_assert(tret); + printf(" %f (creates+removes)/sec\n", ops_thread_op); + + triton_timer(1000); + + if(ops_thread_op < ops_thread_txn) + { + printf(" keeping default setting.\n"); + tret = triton_zeroconf_set( + "triton.bdb.txn_progress_mode", "THREAD_PER_TXN"); + triton_error_assert(tret); + } + else + { + printf(" using bdb txn mode THREAD_PER_OP for subsequent tests.\n"); + } + + /* switch to thread_per_op for flushes */ tret = triton_zeroconf_set( "triton.bdb.flush_progress_mode", "THREAD_PER_OP"); triton_error_assert(tret); - /* TODO: warm up run before real testing */ + printf("vosd_autotune: bdb flushes: THREAD_PER_OP ...\n"); + tret = create_rm_bench(duration, concurrency, &ops_flush_thread_per_op); + triton_error_assert(tret); + printf(" %f (creates+removes)/sec\n", ops_flush_thread_per_op); + + triton_timer(1000); - tret = create_rm_bench(10, &ops_per_sec); + if(ops_flush_thread_per_op > ops_thread_op && ops_flush_thread_per_op > ops_thread_txn) + { + printf(" Using bdb flush mode THREAD_PER_OP for subsequent tests.\n"); + } + else + { + printf(" keeping default setting.\n"); + tret = triton_zeroconf_set( + "triton.bdb.flush_progress_mode", "ONE_THREAD"); + triton_error_assert(tret); + } + + printf("vosd_autotune: write warm up run...\n"); + tret = write_bench(duration, concurrency, 4*1024*1024, &wr_warmup); + triton_error_assert(tret); + printf("vosd_autotune: warm up done.\n"); + + triton_timer(1000); + + printf("vosd_autotune: 4KiB writes ...\n"); + tret = write_bench(duration, concurrency, 4*1024, &wr1_default); + triton_error_assert(tret); + printf(" %f (4KiB writes)/sec\n", wr1_default); + + triton_timer(1000); + + printf("vosd_autotune: 4MiB writes ...\n"); + tret = write_bench(duration, concurrency, 4*1024*1024, &wr2_default); + triton_error_assert(tret); + printf(" %f (4MiB writes)/sec\n", wr2_default); + + triton_timer(1000); - printf("BDB thread_per_txn create+remove rate: %f ops/sec\n", ops_per_sec); /* things to test: * - * - vosd_create() with niids enabled and vosd_discard_niids(), - * stresses bdb write txn performance - * - toggle the txn_progress_mode - * - sweep across coalescing values? - * * - using results from above, do: * * - vosd_write small (4k read) * - with and without o_direct * - with and without threads - * - sweep coalescing values again? * - vosd_write large (4M read) * - with and without o_direct * - with and without threads - * - sweep coalescing values again? * - * - run everything in parallel; we don't really care so much about - * sequential performance - * - maybe do test duration based on elapsed time rather than number of ops? + * - thread pool model for file resource? + * - sweep across coalescing values? * - hold alignment fixed at 4096 for now * */ hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 39184121d296857d6ae222bfb9aae0b2fa5aa4a9
by noreply＠mcs.anl.gov 21 Feb '11

21 Feb '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 39184121d296857d6ae222bfb9aae0b2fa5aa4a9 (commit) from d7213e74911de84daaf2ff0fa0a8d57ae7d907be (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 39184121d296857d6ae222bfb9aae0b2fa5aa4a9 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Mon Feb 21 13:36:37 2011 -0500 bug fix to vosd_discard_niids() function ----------------------------------------------------------------------- Summary of changes: code/src/versioned-osd/prototype/versioned-osd.ae | 2 +- code/src/versioned-osd/prototype/versioned-osd.hae | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/versioned-osd/prototype/versioned-osd.ae b/code/src/versioned-osd/prototype/versioned-osd.ae index 07907e4..6b29350 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.ae +++ b/code/src/versioned-osd/prototype/versioned-osd.ae @@ -1861,7 +1861,7 @@ static __blocking triton_ret_t __vosd_discard_niids_retryable( tret = bdb_cursor_del(dbc_p, 0); keep_going = 1; } - else if(tret != TRITON_SUCCESS) + else if(tret != TRITON_SUCCESS && tret != TRITON_ERR_NOENT) { keep_going = 0; tret_tmp = bdb_cursor_close(dbc_p); diff --git a/code/src/versioned-osd/prototype/versioned-osd.hae b/code/src/versioned-osd/prototype/versioned-osd.hae index 76ab13f..6a0aeb5 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.hae +++ b/code/src/versioned-osd/prototype/versioned-osd.hae @@ -147,6 +147,7 @@ __blocking triton_ret_t vosd_truncate( /** * Discards stale NIIDs + * NOTE: this function fails silently (no error code) if NIID not found */ __blocking triton_ret_t vosd_discard_niids( uint128_t* oid_array, /**< objects */ hooks/post-receive -- Triton Repository

1 0

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

18 Feb '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 d7213e74911de84daaf2ff0fa0a8d57ae7d907be (commit) from b9ff5df4d0b78cc5dc1fa98b3a772ef93e0382e1 (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 d7213e74911de84daaf2ff0fa0a8d57ae7d907be Author: slang <slang(a)mcs.anl.gov> Date: Fri Feb 18 14:55:05 2011 -0600 fix ref count leak bug ----------------------------------------------------------------------- Summary of changes: code/src/aesop/ae-blocking-parser.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) Diff of changes: diff --git a/code/src/aesop/ae-blocking-parser.h b/code/src/aesop/ae-blocking-parser.h index edb154d..492bf72 100644 --- a/code/src/aesop/ae-blocking-parser.h +++ b/code/src/aesop/ae-blocking-parser.h @@ -278,7 +278,7 @@ __ae_post_end: \ __ae_local_cb = ctl->__ae_callback; \ __ae_local_up = ctl->user_ptr; \ triton_mutex_lock(&ctl->gen.mutex); \ - __ae_refcount = ae_ctl_refcount(&ctl->gen); \ + __ae_refcount = ae_ctl_refdec(&ctl->gen); \ assert(__ae_refcount >= 0); \ triton_mutex_unlock(&ctl->gen.mutex); \ __ae_local_cb(__ae_local_up); \ @@ -296,7 +296,7 @@ __ae_post_end: \ __ae_local_up = ctl->user_ptr; \ __ae_ret = __ret_param_expr; \ triton_mutex_lock(&ctl->gen.mutex); \ - __ae_refcount = ae_ctl_refcount(&ctl->gen); \ + __ae_refcount = ae_ctl_refdec(&ctl->gen); \ assert(__ae_refcount >= 0); \ triton_mutex_unlock(&ctl->gen.mutex); \ __ae_local_cb(__ae_local_up, __ae_ret); \ @@ -312,9 +312,9 @@ __ae_post_end: \ __ae_local_cb = ctl->__ae_callback; \ __ae_local_up = ctl->user_ptr; \ triton_mutex_lock(&ctl->gen.mutex); \ - __ae_refcount = ae_ctl_refcount(&ctl->gen); \ - assert(__ae_refcount >= 0); \ + __ae_refcount = ae_ctl_refdec(&ctl->gen); \ triton_mutex_unlock(&ctl->gen.mutex); \ + assert(__ae_refcount >= 0); \ __ae_local_cb(__ae_local_up); \ if(__ae_refcount == 0) ae_ctl_destroy(ctl, &ctl->gen); \ __ae_postret = TRITON_SUCCESS; \ @@ -331,9 +331,9 @@ __ae_post_end: \ __ae_local_up = ctl->user_ptr; \ __ae_ret = __ret_param_expr; \ triton_mutex_lock(&ctl->gen.mutex); \ - __ae_refcount = ae_ctl_refcount(&ctl->gen); \ - assert(__ae_refcount >= 0); \ + __ae_refcount = ae_ctl_refdec(&ctl->gen); \ triton_mutex_unlock(&ctl->gen.mutex); \ + assert(__ae_refcount >= 0); \ __ae_local_cb(__ae_local_up, __ae_ret); \ if(__ae_refcount == 0) ae_ctl_destroy(ctl, &ctl->gen); \ __ae_postret = TRITON_SUCCESS; \ hooks/post-receive -- Triton Repository

1 0

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

18 Feb '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 b9ff5df4d0b78cc5dc1fa98b3a772ef93e0382e1 (commit) from e9a3c0a8ff99db94ddaf589d8c11981556e07552 (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 b9ff5df4d0b78cc5dc1fa98b3a772ef93e0382e1 Author: slang <slang(a)mcs.anl.gov> Date: Fri Feb 18 13:22:09 2011 -0600 fix hints memleak ----------------------------------------------------------------------- Summary of changes: code/src/aesop/hints.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/aesop/hints.c b/code/src/aesop/hints.c index ad2750b..5de8a45 100644 --- a/code/src/aesop/hints.c +++ b/code/src/aesop/hints.c @@ -273,6 +273,7 @@ void ae_hints_destroy(ae_hints_t h) { tmp = next; next = tmp->next; + if(tmp->value) free(tmp->value); free(tmp); } } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. e9a3c0a8ff99db94ddaf589d8c11981556e07552
by noreply＠mcs.anl.gov 17 Feb '11

17 Feb '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 e9a3c0a8ff99db94ddaf589d8c11981556e07552 (commit) from 1ad903fef7370077c04df140b91716a17010d95a (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 e9a3c0a8ff99db94ddaf589d8c11981556e07552 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Feb 17 16:55:55 2011 -0500 hack to make server exit first ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/tests/rosd-create-bench.ae | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Diff of changes: diff --git a/code/src/replicated-osd/tests/rosd-create-bench.ae b/code/src/replicated-osd/tests/rosd-create-bench.ae index 0ecb3dc..c5cbd32 100644 --- a/code/src/replicated-osd/tests/rosd-create-bench.ae +++ b/code/src/replicated-osd/tests/rosd-create-bench.ae @@ -605,7 +605,6 @@ int main(int argc, char *argv[]) { ae_poll(mpi_resource_ctx, 0); } - } else { @@ -775,6 +774,7 @@ int main(int argc, char *argv[]) assert(mpi_ret == MPI_SUCCESS); } #endif + sleep(10); } } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 1ad903fef7370077c04df140b91716a17010d95a
by noreply＠mcs.anl.gov 17 Feb '11

17 Feb '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 1ad903fef7370077c04df140b91716a17010d95a (commit) from d8c6a8764b3cdbc9a30acd8998feef230275486d (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 1ad903fef7370077c04df140b91716a17010d95a Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Feb 17 16:33:55 2011 -0500 use shutdown rpc and turn off fakess for now ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/tests/rosd-create-bench.ae | 48 ++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/replicated-osd/tests/rosd-create-bench.ae b/code/src/replicated-osd/tests/rosd-create-bench.ae index 4b0f0d2..0ecb3dc 100644 --- a/code/src/replicated-osd/tests/rosd-create-bench.ae +++ b/code/src/replicated-osd/tests/rosd-create-bench.ae @@ -48,6 +48,16 @@ char *hostfile; __blocking void do_remote_server(void) { + /* run service engine to process requests */ + assert(AER_DEFAULT_CTX); + aer_service_engine_start(AER_DEFAULT_CTX); + + return; +} + +#if 0 +__blocking void do_remote_server(void) +{ triton_ret_t ret; int32_t result; int rank; @@ -93,9 +103,37 @@ __blocking void do_remote_server(void) } } } +#endif triton_mutex_t oid_mutex = TRITON_MUTEX_INITIALIZER; +__blocking void do_remote_shutdown(void) +{ + triton_ret_t ret; + triton_map_t *mapping; + triton_map_t *scratch; + triton_list_t *map; + uint32_t out; + int i; + + /* get all the server addrs */ + ret = triton_map_get(&map); + + pwait + { + triton_list_for_each_entry(mapping, scratch, map, triton_map_t, link) + { + pbranch + { + ret = remote_triton_server_shutdown(AER_DEFAULT_CTX, mapping->addr, 0, &out); + triton_error_assert(ret); + } + } + } + + return; +} + __blocking void do_remote_noop(void) { triton_ret_t ret; @@ -721,12 +759,22 @@ int main(int argc, char *argv[]) printf("remove\t%d\t%d\t%d\t%d\t%f\t%f\t%f\t%d\n", nclients, nservers, nobjects, nconcurrent, remove_min_elapsed_time, remove_elapsed_time, (double)nobjects*(double)(nclients)/remove_elapsed_time, use_niids); + done = 0; + ret = ae_post_blocking(do_remote_shutdown, cb, NULL, NULL, mpi_resource_ctx, &op_id); + + while(!done) + { + ae_poll(mpi_resource_ctx, 0); + } + +#if 0 /* send a message to each server to tell it we are done */ for(i=0; i<nservers; i++) { mpi_ret = MPI_Send(&done_signal, 1, MPI_CHAR, i, 0, MPI_COMM_WORLD); assert(mpi_ret == MPI_SUCCESS); } +#endif } } hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. d8c6a8764b3cdbc9a30acd8998feef230275486d
by noreply＠mcs.anl.gov 17 Feb '11

17 Feb '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 d8c6a8764b3cdbc9a30acd8998feef230275486d (commit) from 8c2cd3e9c83f36a390240212e371e21fdd1676bb (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 d8c6a8764b3cdbc9a30acd8998feef230275486d Author: Philip Carns <carns(a)mcs.anl.gov> Date: Thu Feb 17 14:14:00 2011 -0600 fix missing remote function register in rosd bench ----------------------------------------------------------------------- Summary of changes: code/src/replicated-osd/tests/rosd-create-bench.ae | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Diff of changes: diff --git a/code/src/replicated-osd/tests/rosd-create-bench.ae b/code/src/replicated-osd/tests/rosd-create-bench.ae index 5e6e5d8..4b0f0d2 100644 --- a/code/src/replicated-osd/tests/rosd-create-bench.ae +++ b/code/src/replicated-osd/tests/rosd-create-bench.ae @@ -28,6 +28,7 @@ /* include server-side rosd skeletons */ #include "src/replicated-osd/rosd_module.h" +#include "src/remote/client_server_shutdown_module.h" /* include client-side rosd stubs */ #include "src/replicated-osd/rosd_stubs.hae" @@ -518,6 +519,8 @@ int main(int argc, char *argv[]) triton_error_assert(ret); ret = aer_remote_register_rosd(); triton_error_assert(ret); + ret = aer_remote_register_client_server_shutdown(); + triton_error_assert(ret); } else { hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 8c2cd3e9c83f36a390240212e371e21fdd1676bb
by noreply＠mcs.anl.gov 15 Feb '11

15 Feb '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 8c2cd3e9c83f36a390240212e371e21fdd1676bb (commit) from f9c4a31c893d206af41a2253da463dea63215fc7 (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 8c2cd3e9c83f36a390240212e371e21fdd1676bb Author: Phil Carns <carns(a)mcs.anl.gov> Date: Tue Feb 15 17:01:47 2011 -0500 incremental work on vosd auto tuning function ----------------------------------------------------------------------- Summary of changes: code/src/versioned-osd/prototype/versioned-osd.ae | 118 +++++++++++++++++++-- 1 files changed, 109 insertions(+), 9 deletions(-) Diff of changes: diff --git a/code/src/versioned-osd/prototype/versioned-osd.ae b/code/src/versioned-osd/prototype/versioned-osd.ae index c103a53..07907e4 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.ae +++ b/code/src/versioned-osd/prototype/versioned-osd.ae @@ -3381,19 +3381,119 @@ __blocking triton_ret_t vosd_check_niid(uint128_t oid, uint64_t niid, int op_typ return(tret); } +static __blocking triton_ret_t purge_niids(uint64_t max) +{ + int i; + uint128_t oid; + uint64_t niid; + triton_ret_t tret; + + for(i=1; i<=max; i++) + { + oid = triton_uint128_from_uint64(i); + niid = i; + tret = vosd_discard_niids(&oid, &niid, 1); + /* TODO: why am I getting ENOENT on an niid here? */ + if(tret != TRITON_ERR_NOENT) + { + triton_error_assert(tret); + } + else + { + printf("Warning: hit ENOENT when purging niid: %llu\n", niid); + } + } + + return(TRITON_SUCCESS); +} + +static __blocking triton_ret_t create_rm_bench(double seconds, double* ops_per_sec) +{ + int concurrent = 32; + int started = 0; + triton_mutex_t started_mutex; + double start_tm; + double end_tm; + double now; + + triton_mutex_init(&started_mutex, NULL); + + start_tm = Wtime(); + pwait + { + pprivate int i; + pprivate triton_ret_t b_ret; + pprivate double now; + pprivate int done = 0; + pprivate uint128_t oid; + pprivate uint64_t niid; + + done = 0; + started = 0; + for(i=0; i<concurrent; i++) + { + pbranch + { + while(!done) + { + triton_mutex_lock(&started_mutex); + now = Wtime(); + if(now - start_tm > seconds) + { + done = 1; + } + else + { + started++; + oid = triton_uint128_from_uint64(started); + niid = started; + } + triton_mutex_unlock(&started_mutex); + + if(!done) + { + b_ret = vosd_create(oid, niid); + triton_error_assert(b_ret); + b_ret = vosd_remove(oid, niid); + triton_error_assert(b_ret); + } + } + } + } + } + end_tm = Wtime(); + + *ops_per_sec = (double)started/(end_tm-start_tm); + + triton_mutex_destroy(&started_mutex); + + /* get rid of any niids that were inserted by the benchmark */ + purge_niids(started); + + return(TRITON_SUCCESS); +} + __blocking triton_ret_t vosd_autotune(void) { - /* TODO: - * - need a way to toggle O_DIRECT mode on the fly rather than forcing - * it at init time: - * - restrictions: all file descriptors must be idle (so that we can - * close them out) before allowing the switch - */ + triton_ret_t tret; + double ops_per_sec; + double duration = 5.0; /* TODO: make this bigger */ + /* benchmark with thread-per-txn */ + tret = triton_zeroconf_set( + "triton.bdb.txn_progress_mode", "THREAD_PER_TXN"); + triton_error_assert(tret); + tret = triton_zeroconf_set( + "triton.bdb.flush_progress_mode", "THREAD_PER_OP"); + triton_error_assert(tret); + + /* TODO: warm up run before real testing */ + + tret = create_rm_bench(10, &ops_per_sec); + + printf("BDB thread_per_txn create+remove rate: %f ops/sec\n", ops_per_sec); /* things to test: * - * - pick a starting point for coalescing - * * - vosd_create() with niids enabled and vosd_discard_niids(), * stresses bdb write txn performance * - toggle the txn_progress_mode @@ -3417,7 +3517,7 @@ __blocking triton_ret_t vosd_autotune(void) * */ - return(TRITON_ERR_NOSYS); + return(TRITON_SUCCESS); } /* hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. f9c4a31c893d206af41a2253da463dea63215fc7
by noreply＠mcs.anl.gov 11 Feb '11

11 Feb '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 f9c4a31c893d206af41a2253da463dea63215fc7 (commit) from 25b73eda97a9bf57bd552b6c13a87be7787f2183 (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 f9c4a31c893d206af41a2253da463dea63215fc7 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Fri Feb 11 16:37:34 2011 -0500 hooks to purge fd cache utility function, will be useful (for example) when toggling odirect flags in autotune function ----------------------------------------------------------------------- Summary of changes: code/src/versioned-osd/prototype/vosd-fd-cache.ae | 147 +++++++++++--------- code/src/versioned-osd/prototype/vosd-fd-cache.hae | 4 + 2 files changed, 87 insertions(+), 64 deletions(-) Diff of changes: diff --git a/code/src/versioned-osd/prototype/vosd-fd-cache.ae b/code/src/versioned-osd/prototype/vosd-fd-cache.ae index 415f9f7..c0c91f1 100644 --- a/code/src/versioned-osd/prototype/vosd-fd-cache.ae +++ b/code/src/versioned-osd/prototype/vosd-fd-cache.ae @@ -31,6 +31,74 @@ static triton_mutex_t fd_mutex = TRITON_MUTEX_INITIALIZER; static int oid_compare(const void *key, struct triton_hash_link *hash_link); static void fd_cache_destructor(struct fd_cache_entry* entry); +static __blocking void fd_cache_purge_internal(int watermark) +{ + struct triton_list_link* iterator; + struct triton_list_link* scratch; + struct fd_cache_entry* dead_entry; + triton_ret_t tret; + struct stat statbuf; + char oid_str[TRITON_UINT128_STRLEN]; + + /* go through unused list and close files until we get below the + * watermark again + */ + triton_list_for_each(iterator, scratch, &unused_list) + { + dead_entry = triton_list_get_entry(iterator, struct fd_cache_entry, + unused_link); + assert(dead_entry->ref_count == 0); + triton_list_del(&dead_entry->unused_link); + triton_list_del(&dead_entry->hash_link); + tret = file_fstat(dead_entry->fd, &statbuf); + if(tret == TRITON_SUCCESS) + { + if(statbuf.st_size < dead_entry->log_offset) + { + /* truncate up; we have a write pending that hasn't hit + * yet even though this file is being closed + */ + tret = file_ftruncate(dead_entry->fd, dead_entry->log_offset); + if(tret != TRITON_SUCCESS) + { + triton_uint128_to_string(oid_str, + TRITON_UINT128_STRLEN, dead_entry->oid); + triton_crit(triton_log_default, + "Failed to truncate object %s, continuing.\n", + oid_str); + triton_error_destroy(tret); + /* will show up as an error at write time, which + * will make more sense + */ + } + + } + } + else + { + triton_crit(triton_log_default, + "Error on fstat of fd %d, continuing.\n", dead_entry->fd); + triton_error_destroy(tret); + } + tret = file_close(dead_entry->fd); + if(tret != TRITON_SUCCESS) + { + triton_crit(triton_log_default, + "Error closing fd %d, continuing.\n", dead_entry->fd); + triton_error_destroy(tret); + } + + triton_mutex_destroy(&dead_entry->log_offset_mutex); + free(dead_entry); + hash_count--; + + if(hash_count < watermark) + break; + } + + return; +} + triton_ret_t fd_cache_initialize(char* cosd_log_path) { triton_mutex_lock(&fd_mutex); @@ -46,7 +114,7 @@ triton_ret_t fd_cache_initialize(char* cosd_log_path) if(!fd_cache_cosd_log_path) { triton_hash_destroy_and_finalize(oid_table, struct fd_cache_entry, - hash_link, fd_cache_destructor); + hash_link, fd_cache_destructor); triton_mutex_unlock(&fd_mutex); return(TRITON_ERR_NOMEM); } @@ -72,13 +140,13 @@ void fd_cache_finalize(void) triton_list_for_each(iterator, scratch, &unused_list) { tmp_entry = triton_list_get_entry(iterator, struct fd_cache_entry, - unused_link); + unused_link); triton_list_del(&tmp_entry->unused_link); } /* iterate through the whole table closing files and freeing memory */ triton_hash_destroy_and_finalize(oid_table, struct fd_cache_entry, - hash_link, fd_cache_destructor); + hash_link, fd_cache_destructor); oid_table = NULL; assert(hash_count == 0); @@ -105,7 +173,7 @@ __blocking void fd_cache_remove(uint128_t oid) if(tmp_link) { tmp_entry = triton_list_get_entry(tmp_link, struct fd_cache_entry, - hash_link); + hash_link); /* we are in trouble if someone is using this */ assert(tmp_entry->ref_count == 0); @@ -116,7 +184,7 @@ __blocking void fd_cache_remove(uint128_t oid) if(tret != TRITON_SUCCESS) { triton_crit(triton_log_default, - "Error closing fd %d, continuing.\n", tmp_entry->fd); + "Error closing fd %d, continuing.\n", tmp_entry->fd); triton_error_destroy(tret); } triton_mutex_destroy(&tmp_entry->log_offset_mutex); @@ -138,15 +206,12 @@ __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* dead_entry; - struct triton_list_link* iterator; - struct triton_list_link* scratch; char log_name [PATH_MAX]; - struct stat statbuf; triton_ret_t tret; triton_ret_t tret_tmp; int posix_open_flags = O_RDWR|O_CREAT; char oid_str[TRITON_UINT128_STRLEN]; + struct stat statbuf; #ifdef HAVE_NOATIME posix_open_flags |= O_NOATIME; @@ -243,61 +308,7 @@ __blocking triton_ret_t fd_cache_get(struct fd_cache_entry **entry, uint128_t oi /* do we have too many objects open now? */ if(hash_count > OPEN_WATERMARK) { - /* go through unused list and close files until we get below the - * watermark again - */ - triton_list_for_each(iterator, scratch, &unused_list) - { - dead_entry = triton_list_get_entry(iterator, struct fd_cache_entry, - unused_link); - assert(dead_entry->ref_count == 0); - triton_list_del(&dead_entry->unused_link); - triton_list_del(&dead_entry->hash_link); - tret = file_fstat(dead_entry->fd, &statbuf); - if(tret == TRITON_SUCCESS) - { - if(statbuf.st_size < dead_entry->log_offset) - { - /* truncate up; we have a write pending that hasn't hit - * yet even though this file is being closed - */ - tret = file_ftruncate(dead_entry->fd, dead_entry->log_offset); - if(tret != TRITON_SUCCESS) - { - triton_uint128_to_string(oid_str, - TRITON_UINT128_STRLEN, dead_entry->oid); - triton_crit(triton_log_default, - "Failed to truncate object %s, continuing.\n", - oid_str); - triton_error_destroy(tret); - /* will show up as an error at write time, which - * will make more sense - */ - } - - } - } - else - { - triton_crit(triton_log_default, - "Error on fstat of fd %d, continuing.\n", dead_entry->fd); - triton_error_destroy(tret); - } - tret = file_close(dead_entry->fd); - if(tret != TRITON_SUCCESS) - { - triton_crit(triton_log_default, - "Error closing fd %d, continuing.\n", dead_entry->fd); - triton_error_destroy(tret); - } - - triton_mutex_destroy(&dead_entry->log_offset_mutex); - free(dead_entry); - hash_count--; - - if(hash_count < OPEN_WATERMARK) - break; - } + fd_cache_purge_internal(OPEN_WATERMARK); } triton_mutex_unlock(&fd_mutex); @@ -385,6 +396,14 @@ static void fd_cache_destructor(struct fd_cache_entry* entry) return; } +__blocking void fd_cache_purge(void) +{ + triton_mutex_lock(&fd_mutex); + fd_cache_purge_internal(0); + triton_mutex_unlock(&fd_mutex); +} + + /* * Local variables: * c-indent-level: 4 diff --git a/code/src/versioned-osd/prototype/vosd-fd-cache.hae b/code/src/versioned-osd/prototype/vosd-fd-cache.hae index 642c433..0877097 100644 --- a/code/src/versioned-osd/prototype/vosd-fd-cache.hae +++ b/code/src/versioned-osd/prototype/vosd-fd-cache.hae @@ -66,6 +66,10 @@ __blocking void fd_cache_remove( uint128_t oid /**< object ID */ ); +/** + * Closes any file descriptors that aren't in active use + */ +__blocking void fd_cache_purge(void); #endif hooks/post-receive -- Triton Repository

1 0

Triton Repository branch, master, updated. 25b73eda97a9bf57bd552b6c13a87be7787f2183
by noreply＠mcs.anl.gov 10 Feb '11

10 Feb '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 25b73eda97a9bf57bd552b6c13a87be7787f2183 (commit) from 30db3c52fb3ff91070e640ec675fa8146b340ed7 (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 25b73eda97a9bf57bd552b6c13a87be7787f2183 Author: Phil Carns <carns(a)mcs.anl.gov> Date: Thu Feb 10 14:37:04 2011 -0500 tweaks to file resource progress mode ----------------------------------------------------------------------- Summary of changes: .../prototype/bdb-resource/bdb-resource.c | 3 - .../prototype/file-resource/file-resource.c | 123 ++++++++++---------- .../prototype/file-resource/file-resource.hae | 1 + code/src/versioned-osd/prototype/versioned-osd.ae | 21 +--- 4 files changed, 64 insertions(+), 84 deletions(-) Diff of changes: diff --git a/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c b/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c index 6d8f5b0..a4f4e45 100644 --- a/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c +++ b/code/src/versioned-osd/prototype/bdb-resource/bdb-resource.c @@ -1076,9 +1076,6 @@ triton_ret_t triton_ret_from_bdb(int error) static triton_ret_t progress_mode_updater(const char *key, const char *value) { - int s; - int tmp_value; - if(!strcmp(key, txn_progress_mode_confkey)) { if(!strcmp(value, "THREAD_PER_OP")) diff --git a/code/src/versioned-osd/prototype/file-resource/file-resource.c b/code/src/versioned-osd/prototype/file-resource/file-resource.c index 19f672a..101d888 100644 --- a/code/src/versioned-osd/prototype/file-resource/file-resource.c +++ b/code/src/versioned-osd/prototype/file-resource/file-resource.c @@ -30,15 +30,18 @@ #define FILE_DEFAULT_OPCACHE_SIZE 1024 static ae_opcache_t file_opcache; -static ae_ops_t file_oplist; +static ae_ops_t file_poll_oplist; +static ae_ops_t file_thread_oplist; static triton_mutex_t file_mutex = TRITON_MUTEX_INITIALIZER; static int triton_file_resource_id; -static enum file_progress_mode triton_file_progress_mode = TRITON_FILE_PROG_NONE; +static enum file_progress_mode meta_progress_mode = TRITON_FILE_PROG_NONE; +static enum file_progress_mode io_progress_mode = TRITON_FILE_PROG_NONE; static triton_debug_mask_t file_r_mask; #define FILE_CONFKEY_PREFIX "triton.file" -static const char *progress_mode_confkey = FILE_CONFKEY_PREFIX ".progress_mode"; +static const char *meta_progress_mode_confkey = FILE_CONFKEY_PREFIX ".meta_progress_mode"; +static const char *io_progress_mode_confkey = FILE_CONFKEY_PREFIX ".io_progress_mode"; struct file_op { @@ -139,19 +142,29 @@ static triton_ret_t file_launch_op(struct ae_op *op, enum file_progress_mode mod int ret; pthread_t tid; pthread_attr_t attr; + struct file_op* f_op = ae_op_entry(op, struct file_op, op); switch(mode) { + case TRITON_FILE_PROG_IN_PLACE: + /* spin on op worker */ + while(f_op->work_fn(op) != 1); + /* call cleanup function if present */ + if(f_op->cleanup_fn) + f_op->cleanup_fn(op); + /* trigger completion of the operation */ + ae_opcache_complete_op(file_opcache, op, triton_ret_t, f_op->return_code); + break; case TRITON_FILE_PROG_POLL: triton_mutex_lock(&file_mutex); - ae_ops_enqueue(op, &file_oplist); + ae_ops_enqueue(op, &file_poll_oplist); ae_resource_request_poll(NULL, triton_file_resource_id); triton_mutex_unlock(&file_mutex); break; case TRITON_FILE_PROG_THREAD_PER_OP: /* put on the queue */ triton_mutex_lock(&file_mutex); - ae_ops_enqueue(op, &file_oplist); + ae_ops_enqueue(op, &file_thread_oplist); triton_mutex_unlock(&file_mutex); /* launch a thread to do the work */ @@ -186,15 +199,6 @@ static triton_ret_t file_launch_op(struct ae_op *op, enum file_progress_mode mod return(0); } -/* file_poll_thread_per_op() - * - * poll function in the thread-per-op mode that doesn't do anything. - */ -static triton_ret_t file_poll_thread_per_op(ae_context_t context) -{ - return(TRITON_SUCCESS); -} - static triton_ret_t file_poll(ae_context_t context) { struct ae_op *a_op; @@ -204,7 +208,7 @@ static triton_ret_t file_poll(ae_context_t context) /* NOTE: poll doesn't need locking, because it is not used in the * threaded modes */ - a_op = ae_ops_dequeue(&file_oplist); + a_op = ae_ops_dequeue(&file_poll_oplist); if(!a_op) { /* nothing to work on */ @@ -222,7 +226,7 @@ static triton_ret_t file_poll(ae_context_t context) /* trigger completion of the operation */ ae_opcache_complete_op(file_opcache, a_op, triton_ret_t, f_op->return_code); - if(!ae_ops_empty(&file_oplist)) + if(!ae_ops_empty(&file_poll_oplist)) { /* need to poll more */ ae_resource_request_poll(NULL, triton_file_resource_id); @@ -275,15 +279,24 @@ triton_ret_t file_init(void) return(ret); } - ret = triton_zeroconf_register(progress_mode_confkey, - "2", progress_mode_updater, - "Specify the progress mode for the File resource (1 for polling, 2 for threaded)"); + ret = triton_zeroconf_register(meta_progress_mode_confkey, + "IN_PLACE", progress_mode_updater, + "Specify the progress mode for metadata ops in the file resource (IN_PLACE, THREAD_PER_OP, or POLL)"); if(ret != TRITON_SUCCESS && ret != TRITON_ERR_EXIST) { return(ret); } - ae_ops_init(&file_oplist); + ret = triton_zeroconf_register(io_progress_mode_confkey, + "THREAD_PER_OP", progress_mode_updater, + "Specify the progress mode for the I/O ops in the file resource (IN_PLACE, THREAD_PER_OP, or POLL)"); + if(ret != TRITON_SUCCESS && ret != TRITON_ERR_EXIST) + { + return(ret); + } + + ae_ops_init(&file_poll_oplist); + ae_ops_init(&file_thread_oplist); ret = AE_OPCACHE_INIT(struct file_op, op, FILE_DEFAULT_OPCACHE_SIZE, &file_opcache); @@ -292,19 +305,6 @@ triton_ret_t file_init(void) return(ret); } - /* modify poll function depending on requested mode */ - switch(triton_file_progress_mode) - { - case TRITON_FILE_PROG_POLL: - triton_file_resource.poll_context = file_poll; - break; - case TRITON_FILE_PROG_THREAD_PER_OP: - triton_file_resource.poll_context = file_poll_thread_per_op; - break; - default: - return(TRITON_ERR_INVAL); - } - ret = ae_resource_register(&triton_file_resource, &triton_file_resource_id); if(ret != TRITON_SUCCESS) { @@ -312,8 +312,6 @@ triton_ret_t file_init(void) return(ret); } - triton_debug(file_r_mask, - "file resource initialized with progress mode %d.\n", triton_file_progress_mode); return TRITON_SUCCESS; } @@ -356,7 +354,7 @@ ae_define_post(triton_ret_t, file_open, f_op->cleanup_fn = NULL; *__ae_op_id = f_op->op_id; - file_launch_op(op, triton_file_progress_mode); + file_launch_op(op, meta_progress_mode); return(TRITON_SUCCESS); } @@ -400,7 +398,7 @@ ae_define_post(triton_ret_t, file_fsync, int fd) f_op->cleanup_fn = NULL; *__ae_op_id = f_op->op_id; - file_launch_op(op, triton_file_progress_mode); + file_launch_op(op, io_progress_mode); return(TRITON_SUCCESS); } @@ -422,7 +420,7 @@ ae_define_post(triton_ret_t, file_fdatasync, int fd) f_op->cleanup_fn = NULL; *__ae_op_id = f_op->op_id; - file_launch_op(op, triton_file_progress_mode); + file_launch_op(op, io_progress_mode); return(TRITON_SUCCESS); } @@ -444,7 +442,7 @@ ae_define_post(triton_ret_t, file_close, int fd) f_op->cleanup_fn = NULL; *__ae_op_id = f_op->op_id; - file_launch_op(op, triton_file_progress_mode); + file_launch_op(op, meta_progress_mode); return(TRITON_SUCCESS); } @@ -532,7 +530,7 @@ ae_define_post(triton_ret_t, file_fstat, f_op->cleanup_fn = NULL; *__ae_op_id = f_op->op_id; - file_launch_op(op, triton_file_progress_mode); + file_launch_op(op, meta_progress_mode); return(TRITON_SUCCESS); } @@ -577,7 +575,7 @@ ae_define_post(triton_ret_t, file_ftruncate, f_op->cleanup_fn = NULL; *__ae_op_id = f_op->op_id; - file_launch_op(op, triton_file_progress_mode); + file_launch_op(op, io_progress_mode); return(TRITON_SUCCESS); } @@ -626,7 +624,7 @@ ae_define_post(triton_ret_t, file_pwrite, f_op->cleanup_fn = NULL; *__ae_op_id = f_op->op_id; - file_launch_op(op, triton_file_progress_mode); + file_launch_op(op, io_progress_mode); return(TRITON_SUCCESS); } @@ -684,7 +682,7 @@ ae_define_post(triton_ret_t, file_pread, f_op->cleanup_fn = NULL; *__ae_op_id = f_op->op_id; - file_launch_op(op, triton_file_progress_mode); + file_launch_op(op, io_progress_mode); return(TRITON_SUCCESS); } @@ -719,31 +717,34 @@ static int pread_work_fn(struct ae_op* op) } static triton_ret_t progress_mode_updater(const char *key, const char *value) -{ - int s; - int tmp_value; - assert(!strcmp(key, progress_mode_confkey)); +{ + enum file_progress_mode *mode; - /* TODO: change this to be run-time configurable once we switch to the - * pipe/poll model - */ - if(triton_init_check("triton.vosd.file") == TRITON_SUCCESS) + if(!strcmp(key, io_progress_mode_confkey)) { - triton_err(triton_log_default, "Error: %s parameter cannot be modified after file resource has been initialized.\n", progress_mode_confkey); - return TRITON_ERR_INVAL; + mode = &io_progress_mode; } - - s = sscanf(value, "%d", &tmp_value); - if(s < 1 || - tmp_value <= TRITON_FILE_PROG_NONE || - tmp_value >= TRITON_FILE_PROG_MAX ) + else if(!strcmp(key, meta_progress_mode_confkey)) + { + mode = &meta_progress_mode; + } + else { - return TRITON_ERR_INVAL; + return(TRITON_ERR_INVAL); } - triton_file_progress_mode = tmp_value; + if(!strcmp(value, "IN_PLACE")) + *mode = TRITON_FILE_PROG_IN_PLACE; + else if(!strcmp(value, "POLL")) + *mode = TRITON_FILE_PROG_POLL; + else if(!strcmp(value, "THREAD_PER_OP")) + *mode = TRITON_FILE_PROG_THREAD_PER_OP; + else + return(TRITON_ERR_INVAL); + triton_debug(file_r_mask, - "file progress mode set to: %d\n", tmp_value); + "%s set to: %s\n", key, value); + return TRITON_SUCCESS; } diff --git a/code/src/versioned-osd/prototype/file-resource/file-resource.hae b/code/src/versioned-osd/prototype/file-resource/file-resource.hae index 90b14a7..ee36f05 100644 --- a/code/src/versioned-osd/prototype/file-resource/file-resource.hae +++ b/code/src/versioned-osd/prototype/file-resource/file-resource.hae @@ -26,6 +26,7 @@ enum file_progress_mode TRITON_FILE_PROG_NONE = 0, /**< invalid mode */ TRITON_FILE_PROG_POLL, /**< requires active polling by client */ TRITON_FILE_PROG_THREAD_PER_OP, /**< spawns new thread for each op */ + TRITON_FILE_PROG_IN_PLACE, /**< immediate execution */ TRITON_FILE_PROG_MAX, /**< invalid mode */ }; diff --git a/code/src/versioned-osd/prototype/versioned-osd.ae b/code/src/versioned-osd/prototype/versioned-osd.ae index d81d453..c103a53 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.ae +++ b/code/src/versioned-osd/prototype/versioned-osd.ae @@ -3384,14 +3384,6 @@ __blocking triton_ret_t vosd_check_niid(uint128_t oid, uint64_t niid, int op_typ __blocking triton_ret_t vosd_autotune(void) { /* TODO: - * - go ahead and switch some of the more obvious operations to either - * execute immediately or else run in non threaded mode - * - examples: open, close, and fstat in file resource should probably - * run in non threaded mode - * - examples: bdb txn open, etc. should just execute immediately - */ - - /* TODO: * - need a way to toggle O_DIRECT mode on the fly rather than forcing * it at init time: * - restrictions: all file descriptors must be idle (so that we can @@ -3413,27 +3405,16 @@ __blocking triton_ret_t vosd_autotune(void) * - with and without o_direct * - with and without threads * - sweep coalescing values again? - * - vosd_read small (4k read) - * - with and without o_direct - * - with and without threads * - vosd_write large (4M read) * - with and without o_direct * - with and without threads * - sweep coalescing values again? - * - vosd_read large (4M read) - * - with and without o_direct - * - with and without threads - * - * - if run as root, then try to drop buffer caches before each read - * test * * - run everything in parallel; we don't really care so much about * sequential performance * - maybe do test duration based on elapsed time rather than number of ops? + * - hold alignment fixed at 4096 for now * - * - other things we could do (probably just hold these at default level - * for the moment?): - * - vary the alignment (for non-odirect use) */ return(TRITON_ERR_NOSYS); hooks/post-receive -- Triton Repository

1 0