calculate c0->current_size more eagerly
git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@1058 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
This commit is contained in:
parent
960ff041e2
commit
f8248240af
1 changed files with 5 additions and 3 deletions
|
@ -272,6 +272,8 @@ void mergeManager::tick(mergeStats * s) {
|
||||||
nanosleep(&ts, 0);
|
nanosleep(&ts, 0);
|
||||||
}
|
}
|
||||||
// Linear backpressure model
|
// Linear backpressure model
|
||||||
|
s->current_size = ltable->tree_bytes;
|
||||||
|
s->out_progress = ((double)ltable->tree_bytes)/((double)ltable->max_c0_size);
|
||||||
double delta = ((double)ltable->tree_bytes)/(0.9*(double)ltable->max_c0_size); // 0 <= delta <= 1.111...
|
double delta = ((double)ltable->tree_bytes)/(0.9*(double)ltable->max_c0_size); // 0 <= delta <= 1.111...
|
||||||
delta -= 1.0;
|
delta -= 1.0;
|
||||||
if(delta > 0.00005) {
|
if(delta > 0.00005) {
|
||||||
|
@ -382,8 +384,8 @@ void mergeManager::pretty_print(FILE * out) {
|
||||||
have_c2 = NULL != lt->get_tree_c2();
|
have_c2 = NULL != lt->get_tree_c2();
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(out,"[merge progress MB/s window (lifetime)]: app [%s %6lldMB ~ %3.0f%% %6.1fsec %4.1f (%4.1f)] %s %s [%s %3.0f%% ~ %3.0f%% %4.1f (%4.1f)] %s %s [%s %3.0f%% %4.1f (%4.1f)] %s ",
|
fprintf(out,"[merge progress MB/s window (lifetime)]: app [%s %6lldMB ~ %3.0f%%/%3.0f%% %6.1fsec %4.1f (%4.1f)] %s %s [%s %3.0f%% ~ %3.0f%% %4.1f (%4.1f)] %s %s [%s %3.0f%% %4.1f (%4.1f)] %s ",
|
||||||
c0->active ? "RUN" : "---", (long long)(c0->lifetime_consumed / mb), 100.0 * c0->out_progress, c0->lifetime_elapsed, c0->bps/((double)mb), c0->lifetime_consumed/(((double)mb)*c0->lifetime_elapsed),
|
c0->active ? "RUN" : "---", (long long)(c0->lifetime_consumed / mb), 100.0 * c0->out_progress, 100.0 * ((double)ltable->tree_bytes)/(double)ltable->max_c0_size, c0->lifetime_elapsed, c0->bps/((double)mb), c0->lifetime_consumed/(((double)mb)*c0->lifetime_elapsed),
|
||||||
have_c0 ? "C0" : "..",
|
have_c0 ? "C0" : "..",
|
||||||
have_c0m ? "C0'" : "...",
|
have_c0m ? "C0'" : "...",
|
||||||
c1->active ? "RUN" : "---", 100.0 * c1->in_progress, 100.0 * c1->out_progress, c1->bps/((double)mb), c1->lifetime_consumed/(((double)mb)*c1->lifetime_elapsed),
|
c1->active ? "RUN" : "---", 100.0 * c1->in_progress, 100.0 * c1->out_progress, c1->bps/((double)mb), c1->lifetime_consumed/(((double)mb)*c1->lifetime_elapsed),
|
||||||
|
@ -391,7 +393,7 @@ void mergeManager::pretty_print(FILE * out) {
|
||||||
have_c1m ? "C1'" : "...",
|
have_c1m ? "C1'" : "...",
|
||||||
c2->active ? "RUN" : "---", 100.0 * c2->in_progress, c2->bps/((double)mb), c2->lifetime_consumed/(((double)mb)*c2->lifetime_elapsed),
|
c2->active ? "RUN" : "---", 100.0 * c2->in_progress, c2->bps/((double)mb), c2->lifetime_consumed/(((double)mb)*c2->lifetime_elapsed),
|
||||||
have_c2 ? "C2" : "..");
|
have_c2 ? "C2" : "..");
|
||||||
#define PP_SIZES
|
// #define PP_SIZES
|
||||||
#ifdef PP_SIZES
|
#ifdef PP_SIZES
|
||||||
fprintf(out, "[target cur base in_small in_large, out, mergeable] C0 %4lld %4lld %4lld %4lld %4lld %4lld %4lld ",
|
fprintf(out, "[target cur base in_small in_large, out, mergeable] C0 %4lld %4lld %4lld %4lld %4lld %4lld %4lld ",
|
||||||
c0->target_size/mb, c0->current_size/mb, c0->base_size/mb, c0->bytes_in_small/mb,
|
c0->target_size/mb, c0->current_size/mb, c0->base_size/mb, c0->bytes_in_small/mb,
|
||||||
|
|
Loading…
Reference in a new issue