diff options
| author | Geir Storli <geirst@yahooinc.com> | 2021-09-21 00:08:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-21 00:08:32 +0200 |
| commit | ac7175f0507ddb73bcc0f4b828c6f369bfd0810d (patch) | |
| tree | a8238c4615480f18d64d2f13a0d7f0f945d88e96 | |
| parent | b0f91ec4a095b504de59ac32a7a56e4c70f72725 (diff) | |
| parent | 6671c35126179b1e71e20528a9392eab9fb3c75f (diff) | |
Merge pull request #19212 from vespa-engine/toregge/vm-redistribute-bm-fixes-pass-1v7.469.18
Rename functions to more consistent names.
| -rw-r--r-- | searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp index 34cd091b615..e5c3959d2d4 100644 --- a/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp +++ b/searchcore/src/apps/vespa-redistribute-bm/vespa_redistribute_bm.cpp @@ -138,7 +138,7 @@ estimate_moved_docs_ratio_shrink(uint32_t redundancy, uint32_t retired_nodes, ui } double -estimate_moved_nodes_ratio_crash(uint32_t redundancy, uint32_t crashed_nodes, uint32_t num_nodes) +estimate_moved_docs_ratio_crash(uint32_t redundancy, uint32_t crashed_nodes, uint32_t num_nodes) { double old_redundancy = redundancy; double old_per_node_doc_ratio = old_redundancy / num_nodes; @@ -152,7 +152,7 @@ estimate_moved_nodes_ratio_crash(uint32_t redundancy, uint32_t crashed_nodes, ui } double -estimate_moved_nodes_ratio_replace(uint32_t redundancy, uint32_t added_nodes, uint32_t retired_nodes, uint32_t num_nodes) +estimate_moved_docs_ratio_replace(uint32_t redundancy, uint32_t added_nodes, uint32_t retired_nodes, uint32_t num_nodes) { uint32_t old_nodes = num_nodes - added_nodes; double old_redundancy = std::min(redundancy, old_nodes); @@ -163,9 +163,8 @@ estimate_moved_nodes_ratio_replace(uint32_t redundancy, uint32_t added_nodes, ui double moved_ratio = new_per_node_doc_ratio * added_nodes; uint32_t stable_nodes = num_nodes - added_nodes - retired_nodes; // Account for extra documents moved from retired nodes to stable nodes - // TODO: Fix calculation - double extra_moved_ratio = (new_per_node_doc_ratio - old_per_node_doc_ratio) * stable_nodes; - extra_moved_ratio += new_per_node_doc_ratio * stable_nodes * retired_nodes / new_nodes; + double extra_per_stable_node_doc_ratio = new_per_node_doc_ratio * added_nodes / old_nodes; + double extra_moved_ratio = (std::min(1.0, new_per_node_doc_ratio + extra_per_stable_node_doc_ratio) - old_per_node_doc_ratio) * stable_nodes; moved_ratio += extra_moved_ratio; LOG(info, "estimated_moved_docs_ratio_replace(%u,%u,%u,%u)=%4.2f, (of which %4.2f extra)", redundancy, added_nodes, retired_nodes, num_nodes, moved_ratio, extra_moved_ratio); return moved_ratio; @@ -410,9 +409,9 @@ Benchmark::estimate_moved_docs() return _params.get_documents() * estimate_moved_docs_ratio_shrink(_params.get_redundancy(), _params.get_flip_nodes(), _params.get_num_nodes()); case Mode::PERM_CRASH: case Mode::TEMP_CRASH: - return _params.get_documents() * estimate_moved_nodes_ratio_crash(_params.get_redundancy(), _params.get_flip_nodes(), _params.get_num_nodes()); + return _params.get_documents() * estimate_moved_docs_ratio_crash(_params.get_redundancy(), _params.get_flip_nodes(), _params.get_num_nodes()); case Mode::REPLACE: - return _params.get_documents() * estimate_moved_nodes_ratio_replace(_params.get_redundancy(), _params.get_flip_nodes(), _params.get_flip_nodes(), _params.get_num_nodes()); + return _params.get_documents() * estimate_moved_docs_ratio_replace(_params.get_redundancy(), _params.get_flip_nodes(), _params.get_flip_nodes(), _params.get_num_nodes()); default: return 0.0; } |