greg/stasis-bLSM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed some statistics computations. They are still wrong. It crashes for an unknown reason. However, this version sometimes breaks 10K op/s for loads, and 1K op/s for workloada

Browse source 
git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@1047 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
This commit is contained in:
sears 2010-08-23 17:11:31 +00:00
parent bcea21c06a
commit 98b88a227b
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mergeManager.cpp
View file

@ -100,7 +100,7 @@ void mergeManager::update_progress(mergeStats * s, int delta) {
} }
if(s->merge_level != 2) { if(s->merge_level != 2) {
if(s->mergeable_size) { if(s->mergeable_size) {
s->out_progress = ((double)s->current_size) / (double)s->target_size; s->out_progress = ((double)s->current_size + (double)s->base_size) / (double)s->target_size;
} else { } else {
s->out_progress = 0.0; s->out_progress = 0.0;
} }
@ -112,6 +112,9 @@ void mergeManager::update_progress(mergeStats * s, int delta) {
s->current_size = s->bytes_out - s->bytes_in_large; s->current_size = s->bytes_out - s->bytes_in_large;
s->out_progress = ((double)s->current_size) / (double)s->target_size; s->out_progress = ((double)s->current_size) / (double)s->target_size;
} else { } else {
if(s->merge_level == 1 && s->mergeable_size) {
s->out_progress = ((double)s->current_size) / (double)s->target_size;
}
s->current_size = s->base_size + s->bytes_out - s->bytes_in_large; s->current_size = s->base_size + s->bytes_out - s->bytes_in_large;
} }
#endif #endif
@ -262,10 +265,10 @@ void mergeManager::tick(mergeStats * s, bool block, bool force) {
spin ++; spin ++;
total_sleep += sleeptime; total_sleep += sleeptime;
if((spin > 40) || (total_sleep > (max_sleep * 20.0))) { // if((spin > 40) || (total_sleep > (max_sleep * 20.0))) {
printf("\nMerge thread %d c0->out=%f c1->in=%f c1->out=%f c2->in=%f\n", s->merge_level, c0->out_progress, c1->in_progress, c1->out_progress, c2->in_progress); printf("\nMerge thread %d c0->out=%f c1->in=%f c1->out=%f c2->in=%f\n", s->merge_level, c0->out_progress, c1->in_progress, c1->out_progress, c2->in_progress);
printf("\nMerge thread %d Overshoot: raw=%lld, d=%lld eff=%lld eff2=%lld Throttle min(1, %6f) spin %d, total_sleep %6.3f\n", s->merge_level, (long long)raw_overshoot, (long long)overshoot_fudge, (long long)overshoot, (long long)overshoot2, sleeptime, spin, total_sleep); printf("\nMerge thread %d Overshoot: raw=%lld, d=%lld eff=%lld eff2=%lld Throttle min(1, %6f) spin %d, total_sleep %6.3f\n", s->merge_level, (long long)raw_overshoot, (long long)overshoot_fudge, (long long)overshoot, (long long)overshoot2, sleeptime, spin, total_sleep);
} //}
sleeping[s->merge_level] = true; sleeping[s->merge_level] = true;
if(s->merge_level == 0) abort(); if(s->merge_level == 0) abort();