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 101a6d1f851d461ca54c17ab2fbe310425820ca2 (commit) from 859df51fa6f05a24435cb1d309799ca83f0f1b97 (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 101a6d1f851d461ca54c17ab2fbe310425820ca2 Author: Phil Carns <[email protected]> Date: Thu Feb 24 15:48:54 2011 -0500 fix vosd bug if retry_count hint isn't set ----------------------------------------------------------------------- Summary of changes: code/src/versioned-osd/prototype/versioned-osd.ae | 12 +++++++++++- 1 files changed, 11 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 0ba97dc..0a53c9f 100644 --- a/code/src/versioned-osd/prototype/versioned-osd.ae +++ b/code/src/versioned-osd/prototype/versioned-osd.ae @@ -237,13 +237,23 @@ static __blocking triton_ret_t check_niid(DB_TXN* txn, uint128_t oid, uint64_t n DBT key, value; int retry_count; + /* TODO: rethink what hint we use to control this, and what the default + * should be + */ tret = aesop_hints_get("triton.remote.retry_count", sizeof(retry_count), &retry_count); - if(tret != TRITON_SUCCESS) + if(tret == TRITON_ERR_HINT_MISSING_TYPE) + { + /* disable niid checks if the caller hasn't set a retry hint */ + retry_count = 0; + triton_error_destroy(tret); + } + else if(tret != TRITON_SUCCESS) { triton_log_error(triton_log_default, tret, "aesop_hints_get()"); return(tret); } + if(retry_count == 0) { /* not a retry, so don't bother checking niid */ hooks/post-receive -- Triton Repository