From bede330b9894752173bf71fe883e0c84a784d5ce Mon Sep 17 00:00:00 2001 From: Deepkaran Date: Tue, 13 Sep 2022 11:56:12 -0700 Subject: [PATCH] MB-52109 Update test files to use mandatoryQuota Change-Id: I4494d4b5485055497db246c70218524d7e89efe5 --- .../tenantaware/topology/1_empty_node_1_sg.json | 2 +- .../topology/1_non_empty_node_1_sg.json | 2 +- .../tenantaware/topology/2_empty_nodes_1_sg.json | 4 ++-- .../topology/2_non_empty_node_1_sg.json | 4 ++-- .../tenantaware/topology/4_empty_nodes_2_sg.json | 8 ++++---- .../topology/4_non_empty_nodes_2_sg_a.json | 8 ++++---- .../topology/4_non_empty_nodes_2_sg_b.json | 8 ++++---- .../topology/4_non_empty_nodes_2_sg_c.json | 8 ++++---- .../topology/4_non_empty_nodes_2_sg_d.json | 8 ++++---- .../topology/4_non_empty_nodes_2_sg_e.json | 8 ++++---- .../topology/6_non_empty_nodes_3_sg_a.json | 12 ++++++------ .../topology/6_non_empty_nodes_3_sg_b.json | 12 ++++++------ .../topology/6_non_empty_nodes_3_sg_c.json | 12 ++++++------ .../topology/6_non_empty_nodes_3_sg_d.json | 12 ++++++------ .../topology/6_non_empty_nodes_3_sg_e.json | 12 ++++++------ .../rebalance/6_non_empty_nodes_3_sg_a.json | 12 ++++++------ .../rebalance/6_non_empty_nodes_3_sg_a_out.json | 12 ++++++------ .../rebalance/6_non_empty_nodes_3_sg_b.json | 12 ++++++------ .../rebalance/6_non_empty_nodes_3_sg_b_out.json | 12 ++++++------ .../rebalance/6_non_empty_nodes_3_sg_c.json | 12 ++++++------ .../rebalance/6_non_empty_nodes_3_sg_c_out.json | 12 ++++++------ .../rebalance/6_non_empty_nodes_3_sg_d.json | 12 ++++++------ .../rebalance/6_non_empty_nodes_3_sg_d_out.json | 12 ++++++------ .../rebalance/6_non_empty_nodes_3_sg_e.json | 12 ++++++------ .../rebalance/6_non_empty_nodes_3_sg_e_out.json | 12 ++++++------ .../rebalance/6_non_empty_nodes_3_sg_h.json | 12 ++++++------ .../rebalance/6_non_empty_nodes_3_sg_h_out.json | 12 ++++++------ .../rebalance/8_non_empty_nodes_4_sg_f.json | 16 ++++++++-------- .../rebalance/8_non_empty_nodes_4_sg_f_out.json | 16 ++++++++-------- .../rebalance/8_non_empty_nodes_4_sg_g.json | 16 ++++++++-------- .../rebalance/8_non_empty_nodes_4_sg_g_out.json | 16 ++++++++-------- .../rebalance/8_non_empty_nodes_4_sg_h.json | 16 ++++++++-------- .../rebalance/8_non_empty_nodes_4_sg_h_out.json | 16 ++++++++-------- 33 files changed, 180 insertions(+), 180 deletions(-) diff --git a/secondary/tests/testdata/planner/tenantaware/topology/1_empty_node_1_sg.json b/secondary/tests/testdata/planner/tenantaware/topology/1_empty_node_1_sg.json index 33391f731..61aedb198 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/1_empty_node_1_sg.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/1_empty_node_1_sg.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0 + "mandatoryQuota":0 } ], "isLive":true, diff --git a/secondary/tests/testdata/planner/tenantaware/topology/1_non_empty_node_1_sg.json b/secondary/tests/testdata/planner/tenantaware/topology/1_non_empty_node_1_sg.json index 9f33c9774..07891aa56 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/1_non_empty_node_1_sg.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/1_non_empty_node_1_sg.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/2_empty_nodes_1_sg.json b/secondary/tests/testdata/planner/tenantaware/topology/2_empty_nodes_1_sg.json index 621423a67..7edb7fd4f 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/2_empty_nodes_1_sg.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/2_empty_nodes_1_sg.json @@ -4,13 +4,13 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0 + "mandatoryQuota":0 }, { "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0 + "mandatoryQuota":0 } ], "isLive":true, diff --git a/secondary/tests/testdata/planner/tenantaware/topology/2_non_empty_node_1_sg.json b/secondary/tests/testdata/planner/tenantaware/topology/2_non_empty_node_1_sg.json index f6f308404..fec3b0c30 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/2_non_empty_node_1_sg.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/2_non_empty_node_1_sg.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -22,7 +22,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"xxx15192216a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/4_empty_nodes_2_sg.json b/secondary/tests/testdata/planner/tenantaware/topology/4_empty_nodes_2_sg.json index cdaaec77d..7b6c5c160 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/4_empty_nodes_2_sg.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/4_empty_nodes_2_sg.json @@ -4,25 +4,25 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0 + "mandatoryQuota":0 }, { "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":0 + "mandatoryQuota":0 }, { "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0 + "mandatoryQuota":0 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":0 + "mandatoryQuota":0 } ], "isLive":true, diff --git a/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_a.json b/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_a.json index 0526ec77d..e92e912e7 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_a.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_a.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -22,7 +22,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -40,14 +40,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000 } ], diff --git a/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_b.json b/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_b.json index d10d7f8a5..65edb500c 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_b.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_b.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -22,21 +22,21 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000 }, { "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_c.json b/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_c.json index 309032888..30ae94bf8 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_c.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_c.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -22,7 +22,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -40,7 +40,7 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -58,7 +58,7 @@ "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_d.json b/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_d.json index d8c637b83..7dfe9fab3 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_d.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_d.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":1000, "indexes": [ { @@ -22,7 +22,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -40,7 +40,7 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -58,7 +58,7 @@ "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":1000, "indexes": [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_e.json b/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_e.json index 1b3f95331..5984fa003 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_e.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/4_non_empty_nodes_2_sg_e.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":8000, "indexes": [ { @@ -22,7 +22,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -40,7 +40,7 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -58,7 +58,7 @@ "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":8000, "indexes": [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_a.json b/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_a.json index 5e46987ed..40c6aeae8 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_a.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_a.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -49,7 +49,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":700000000, + "mandatoryQuota":700000000, "actualUnits":1000, "indexes": [ { @@ -94,14 +94,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -146,7 +146,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":700000000, + "mandatoryQuota":700000000, "actualUnits":1000, "indexes": [ { @@ -191,7 +191,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 } ], diff --git a/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_b.json b/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_b.json index 3fa185ea4..35dba4c21 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_b.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_b.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -49,7 +49,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":5000, "indexes": [ { @@ -94,14 +94,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -146,7 +146,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":5000, "indexes": [ { @@ -191,7 +191,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 } ], diff --git a/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_c.json b/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_c.json index 711eb8746..2eb77b9f7 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_c.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_c.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -49,7 +49,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":700000000, + "mandatoryQuota":700000000, "actualUnits":1000, "indexes": [ { @@ -94,14 +94,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":2000 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -146,7 +146,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":700000000, + "mandatoryQuota":700000000, "actualUnits":1000, "indexes": [ { @@ -191,7 +191,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":2000 } ], diff --git a/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_d.json b/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_d.json index 84c694b8e..fba28a792 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_d.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_d.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":680000000, + "mandatoryQuota":680000000, "actualUnits":1000, "indexes": [ { @@ -49,7 +49,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":700000000, + "mandatoryQuota":700000000, "actualUnits":1000, "indexes": [ { @@ -94,14 +94,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":650000000, + "mandatoryQuota":650000000, "actualUnits":0 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":680000000, + "mandatoryQuota":680000000, "actualUnits":1000, "indexes": [ { @@ -146,7 +146,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":700000000, + "mandatoryQuota":700000000, "actualUnits":1000, "indexes": [ { @@ -191,7 +191,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":650000000, + "mandatoryQuota":650000000, "actualUnits":0 } ], diff --git a/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_e.json b/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_e.json index 787219853..33e7540a8 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_e.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/6_non_empty_nodes_3_sg_e.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":5000, "indexes": [ { @@ -49,7 +49,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":5500, "indexes": [ { @@ -94,14 +94,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":4500 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":5000, "indexes": [ { @@ -146,7 +146,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":5500, "indexes": [ { @@ -191,7 +191,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":4500 } ], diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_a.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_a.json index e798565d2..9f15849ad 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_a.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_a.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -57,7 +57,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":1000, "indexes": [ { @@ -110,14 +110,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -170,7 +170,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":1000, "indexes": [ { @@ -223,7 +223,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 } ], diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_a_out.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_a_out.json index 138d48b1a..a160db4f7 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_a_out.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_a_out.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -57,7 +57,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":1000, "indexes": [ { @@ -88,7 +88,7 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":400000000, + "mandatoryQuota":400000000, "actualUnits":500, "indexes": [ { @@ -119,7 +119,7 @@ "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -172,7 +172,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":1000, "indexes": [ { @@ -203,7 +203,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":400000000, + "mandatoryQuota":400000000, "actualUnits":500, "indexes": [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_b.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_b.json index 8fbff3876..c46b0b899 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_b.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_b.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":400000000, + "mandatoryQuota":400000000, "actualUnits":8000, "indexes": [ { @@ -57,7 +57,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":400000000, + "mandatoryQuota":400000000, "actualUnits":1000, "indexes": [ { @@ -110,14 +110,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":400000000, + "mandatoryQuota":400000000, "actualUnits":8000, "indexes": [ { @@ -170,7 +170,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":400000000, + "mandatoryQuota":400000000, "actualUnits":1000, "indexes": [ { @@ -223,7 +223,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 } ], diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_b_out.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_b_out.json index 5d6787dab..ed7182c08 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_b_out.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_b_out.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":5000, "indexes": [ { @@ -35,7 +35,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":400000000, + "mandatoryQuota":400000000, "actualUnits":1000, "indexes": [ { @@ -88,7 +88,7 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":3000, "indexes" : [ { @@ -120,7 +120,7 @@ "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":5000, "indexes": [ { @@ -151,7 +151,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":400000000, + "mandatoryQuota":400000000, "actualUnits":1000, "indexes": [ { @@ -204,7 +204,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":3000, "indexes" : [ diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_c.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_c.json index 4625ae338..e695969dc 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_c.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_c.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":9000, "indexes": [ { @@ -79,7 +79,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -132,14 +132,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":9000, "indexes": [ { @@ -214,7 +214,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":1000, "indexes": [ { @@ -267,7 +267,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 } ], diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_c_out.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_c_out.json index da496e98a..d7c36fb77 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_c_out.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_c_out.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":400000000, + "mandatoryQuota":400000000, "actualUnits":4000, "indexes": [ { @@ -35,7 +35,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":500000000, + "mandatoryQuota":500000000, "actualUnits":3000, "indexes": [ { @@ -110,7 +110,7 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":3000, "indexes": [ { @@ -141,7 +141,7 @@ "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":400000000, + "mandatoryQuota":400000000, "actualUnits":4000, "indexes": [ { @@ -172,7 +172,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":500000000, + "mandatoryQuota":500000000, "actualUnits":3000, "indexes": [ { @@ -247,7 +247,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":3000, "indexes": [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_d.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_d.json index 185ce81a8..c713b826e 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_d.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_d.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":9000, "indexes": [ { @@ -79,7 +79,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":1000, "indexes": [ { @@ -132,14 +132,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":9000, "indexes": [ { @@ -214,7 +214,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":1000, "indexes": [ { @@ -267,7 +267,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 } ], diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_d_out.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_d_out.json index 5f7380f02..e1e8aa46a 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_d_out.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_d_out.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":9000, "indexes": [ { @@ -35,7 +35,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":1000, "indexes": [ { @@ -110,7 +110,7 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":4000, "indexes": [ { @@ -141,7 +141,7 @@ "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":9000, "indexes": [ { @@ -172,7 +172,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":1000, "indexes": [ { @@ -247,7 +247,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":4000, "indexes": [ diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_e.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_e.json index d2ac5c0bd..8c5a87b56 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_e.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_e.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":5000, "indexes": [ { @@ -35,7 +35,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":3000, "indexes": [ { @@ -110,7 +110,7 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":700000000, + "mandatoryQuota":700000000, "actualUnits":3000, "indexes": [ { @@ -141,7 +141,7 @@ "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":5000, "indexes": [ { @@ -172,7 +172,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":3000, "indexes": [ { @@ -247,7 +247,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":700000000, + "mandatoryQuota":700000000, "actualUnits":3000, "indexes": [ diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_e_out.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_e_out.json index 5f9fc8787..41cb3a710 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_e_out.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_e_out.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":5000, "indexes": [ { @@ -35,7 +35,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":1000, "indexes": [ { @@ -110,7 +110,7 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":3000, "indexes": [ { @@ -141,7 +141,7 @@ "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":300000000, + "mandatoryQuota":300000000, "actualUnits":5000, "indexes": [ { @@ -172,7 +172,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":3000, "indexes": [ { @@ -247,7 +247,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":700000000, + "mandatoryQuota":700000000, "actualUnits":3000, "indexes": [ diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_h.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_h.json index 97afdad6b..46ccd7191 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_h.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_h.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":1000, "indexes": [ { @@ -24,7 +24,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":2000, "indexes": [ { @@ -55,14 +55,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":1000, "indexes": [ { @@ -82,7 +82,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":2000, "indexes": [ { @@ -113,7 +113,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 } ], diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_h_out.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_h_out.json index 48253eb0f..38e80966a 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_h_out.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/6_non_empty_nodes_3_sg_h_out.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":1000, "indexes": [ { @@ -24,7 +24,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":2000, "indexes": [ { @@ -44,7 +44,7 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0, "indexes": [ { @@ -64,7 +64,7 @@ "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":1000, "indexes": [ { @@ -84,7 +84,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":2000, "indexes": [ { @@ -104,7 +104,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":1000, "indexes" : [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_f.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_f.json index df5eb7987..744a7545d 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_f.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_f.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":8000, "indexes": [ { @@ -79,7 +79,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":1000000000, + "mandatoryQuota":1000000000, "actualUnits":7000, "indexes": [ { @@ -154,14 +154,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":8000, "indexes": [ { @@ -236,7 +236,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":1000000000, + "mandatoryQuota":1000000000, "actualUnits":7000, "indexes": [ { @@ -311,14 +311,14 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 }, { "nodeId":"127.0.0.1:9007", "nodeUUID":"ppp15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":100, "indexes": [ { @@ -338,7 +338,7 @@ "nodeId":"127.0.0.1:9008", "nodeUUID":"www15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":100, "indexes": [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_f_out.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_f_out.json index d2b08fc4a..3d9cbf61f 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_f_out.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_f_out.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":600000000, + "mandatoryQuota":600000000, "actualUnits":4000, "indexes": [ { @@ -35,7 +35,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":600000000, + "mandatoryQuota":600000000, "actualUnits":4000, "indexes": [ { @@ -66,7 +66,7 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":525000000, + "mandatoryQuota":525000000, "actualUnits":4000, "indexes": [ { @@ -130,7 +130,7 @@ "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":600000000, + "mandatoryQuota":600000000, "actualUnits":4000, "indexes": [ { @@ -161,7 +161,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":600000000, + "mandatoryQuota":600000000, "actualUnits":4000, "indexes": [ { @@ -192,7 +192,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":525000000, + "mandatoryQuota":525000000, "actualUnits":4000, "indexes" : [ { @@ -257,7 +257,7 @@ "nodeId":"127.0.0.1:9007", "nodeUUID":"ppp15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":375000000, + "mandatoryQuota":375000000, "actualUnits":3100, "indexes": [ { @@ -310,7 +310,7 @@ "nodeId":"127.0.0.1:9008", "nodeUUID":"www15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":375000000, + "mandatoryQuota":375000000, "actualUnits":3100, "indexes": [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_g.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_g.json index c3f5cff34..7351403bd 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_g.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_g.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":8000, "indexes": [ { @@ -79,7 +79,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":1000000000, + "mandatoryQuota":1000000000, "actualUnits":7000, "indexes": [ { @@ -154,14 +154,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":8000, "indexes": [ { @@ -236,7 +236,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":1000000000, + "mandatoryQuota":1000000000, "actualUnits":7000, "indexes": [ { @@ -311,14 +311,14 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 }, { "nodeId":"127.0.0.1:9007", "nodeUUID":"ppp15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":100, "indexes": [ { @@ -338,7 +338,7 @@ "nodeId":"127.0.0.1:9008", "nodeUUID":"www15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":100, "indexes": [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_g_out.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_g_out.json index fb1c8c118..6b29bc057 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_g_out.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_g_out.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":600000000, + "mandatoryQuota":600000000, "actualUnits":4000, "indexes": [ { @@ -35,7 +35,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":600000000, + "mandatoryQuota":600000000, "actualUnits":4000, "indexes": [ { @@ -66,7 +66,7 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":330000000, + "mandatoryQuota":330000000, "actualUnits":3700, "indexes": [ { @@ -119,7 +119,7 @@ "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":600000000, + "mandatoryQuota":600000000, "actualUnits":4000, "indexes": [ { @@ -150,7 +150,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":600000000, + "mandatoryQuota":600000000, "actualUnits":4000, "indexes": [ { @@ -181,7 +181,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":330000000, + "mandatoryQuota":330000000, "actualUnits":3700, "indexes": [ { @@ -234,7 +234,7 @@ "nodeId":"127.0.0.1:9007", "nodeUUID":"ppp15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":570000000, + "mandatoryQuota":570000000, "actualUnits":3200, "indexes": [ { @@ -298,7 +298,7 @@ "nodeId":"127.0.0.1:9008", "nodeUUID":"www15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":570000000, + "mandatoryQuota":570000000, "actualUnits":3200, "indexes": [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_h.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_h.json index d0b087661..0458bc85d 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_h.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_h.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":8000, "indexes": [ { @@ -101,7 +101,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":1000000000, + "mandatoryQuota":1000000000, "actualUnits":7000, "indexes": [ { @@ -198,14 +198,14 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 }, { "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":900000000, + "mandatoryQuota":900000000, "actualUnits":8000, "indexes": [ { @@ -302,7 +302,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":1000000000, + "mandatoryQuota":1000000000, "actualUnits":7000, "indexes": [ { @@ -399,14 +399,14 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":0, + "mandatoryQuota":0, "actualUnits":0 }, { "nodeId":"127.0.0.1:9007", "nodeUUID":"ppp15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":100, "indexes": [ { @@ -426,7 +426,7 @@ "nodeId":"127.0.0.1:9008", "nodeUUID":"www15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":200000000, + "mandatoryQuota":200000000, "actualUnits":100, "indexes": [ { diff --git a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_h_out.json b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_h_out.json index e56bac593..2a91dc162 100755 --- a/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_h_out.json +++ b/secondary/tests/testdata/planner/tenantaware/topology/rebalance/8_non_empty_nodes_4_sg_h_out.json @@ -4,7 +4,7 @@ "nodeId":"127.0.0.1:9001", "nodeUUID":"fdb15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":600000000, + "mandatoryQuota":600000000, "actualUnits":4000, "indexes": [ { @@ -35,7 +35,7 @@ "nodeId":"127.0.0.1:9002", "nodeUUID":"abc15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":600000000, + "mandatoryQuota":600000000, "actualUnits":4000, "indexes": [ { @@ -66,7 +66,7 @@ "nodeId":"127.0.0.1:9003", "nodeUUID":"def15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":330000000, + "mandatoryQuota":330000000, "actualUnits":3700, "indexes": [ { @@ -163,7 +163,7 @@ "nodeId":"127.0.0.1:9004", "nodeUUID":"zzz15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":600000000, + "mandatoryQuota":600000000, "actualUnits":4000, "indexes": [ { @@ -194,7 +194,7 @@ "nodeId":"127.0.0.1:9005", "nodeUUID":"hhh15192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":600000000, + "mandatoryQuota":600000000, "actualUnits":4000, "indexes": [ { @@ -225,7 +225,7 @@ "nodeId":"127.0.0.1:9006", "nodeUUID":"qqq5192216a984a53fc19de249e0ba4", "serverGroup":"sg3", - "actualRSS":330000000, + "mandatoryQuota":330000000, "actualUnits":3700, "indexes": [ { @@ -322,7 +322,7 @@ "nodeId":"127.0.0.1:9007", "nodeUUID":"ppp15192216a984a53fc19de249e0ba4", "serverGroup":"sg1", - "actualRSS":570000000, + "mandatoryQuota":570000000, "actualUnits":3200, "indexes": [ { @@ -386,7 +386,7 @@ "nodeId":"127.0.0.1:9008", "nodeUUID":"www15192216a984a53fc19de249e0ba4", "serverGroup":"sg2", - "actualRSS":570000000, + "mandatoryQuota":570000000, "actualUnits":3200, "indexes": [ {