From 29c9a538d30c081aadfa4b6d9182c7e89e6d4c9a Mon Sep 17 00:00:00 2001 From: A-Harby Date: Tue, 4 Jun 2024 20:28:45 +0300 Subject: [PATCH 1/2] fix disk size sru in filters of the grid nightly scripts --- packages/grid_client/scripts/dynamic_single_vm.ts | 2 +- packages/grid_client/scripts/multiple_vms.ts | 2 +- .../grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts | 2 +- packages/grid_client/scripts/vm_with_qsfs.ts | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/grid_client/scripts/dynamic_single_vm.ts b/packages/grid_client/scripts/dynamic_single_vm.ts index b9d0afb2ea..95e2aee910 100644 --- a/packages/grid_client/scripts/dynamic_single_vm.ts +++ b/packages/grid_client/scripts/dynamic_single_vm.ts @@ -30,7 +30,7 @@ async function main() { const vmQueryOptions: FilterOptions = { cru: 1, mru: 1, // GB - sru: 1, + sru: 5, availableFor: grid3.twinId, country: "Belgium", }; diff --git a/packages/grid_client/scripts/multiple_vms.ts b/packages/grid_client/scripts/multiple_vms.ts index 9ba3a443e6..e95de92e52 100644 --- a/packages/grid_client/scripts/multiple_vms.ts +++ b/packages/grid_client/scripts/multiple_vms.ts @@ -30,7 +30,7 @@ async function main() { const vmQueryOptions: FilterOptions = { cru: 1, mru: 1, // GB - sru: 1, + sru: 10, availableFor: grid3.twinId, farmId: 1, }; diff --git a/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts b/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts index b3122d542e..f617a631f7 100644 --- a/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts +++ b/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts @@ -60,7 +60,7 @@ async function main() { }; const qsfsQueryOptions: FilterOptions = { - hru: 6, + hru: 10, availableFor: grid3.twinId, farmId: 1, }; diff --git a/packages/grid_client/scripts/vm_with_qsfs.ts b/packages/grid_client/scripts/vm_with_qsfs.ts index ffef85948f..bdae4293e6 100644 --- a/packages/grid_client/scripts/vm_with_qsfs.ts +++ b/packages/grid_client/scripts/vm_with_qsfs.ts @@ -46,13 +46,13 @@ async function main() { const vmQueryOptions: FilterOptions = { cru: 1, mru: 1, // GB - sru: 1, + sru: 5, availableFor: grid3.twinId, farmId: 1, }; const qsfsQueryOptions: FilterOptions = { - hru: 6, + hru: 10, availableFor: grid3.twinId, farmId: 1, }; From 71397f43a3be30f61962786e3f7f513c942b03b7 Mon Sep 17 00:00:00 2001 From: A-Harby Date: Wed, 5 Jun 2024 21:36:45 +0300 Subject: [PATCH 2/2] add a caution 2 GB to every script just in case --- packages/grid_client/scripts/dynamic_single_vm.ts | 2 +- packages/grid_client/scripts/multiple_vms.ts | 2 +- .../grid_client/scripts/orchestrators/kubernetes_leader.ts | 4 ++-- .../scripts/orchestrators/kubernetes_with_qsfs.ts | 6 +++--- packages/grid_client/scripts/vm_with_qsfs.ts | 4 ++-- packages/grid_client/scripts/zdb.ts | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/grid_client/scripts/dynamic_single_vm.ts b/packages/grid_client/scripts/dynamic_single_vm.ts index 95e2aee910..7d74ea3ffc 100644 --- a/packages/grid_client/scripts/dynamic_single_vm.ts +++ b/packages/grid_client/scripts/dynamic_single_vm.ts @@ -30,7 +30,7 @@ async function main() { const vmQueryOptions: FilterOptions = { cru: 1, mru: 1, // GB - sru: 5, + sru: 7, availableFor: grid3.twinId, country: "Belgium", }; diff --git a/packages/grid_client/scripts/multiple_vms.ts b/packages/grid_client/scripts/multiple_vms.ts index e95de92e52..4c7afdbb23 100644 --- a/packages/grid_client/scripts/multiple_vms.ts +++ b/packages/grid_client/scripts/multiple_vms.ts @@ -30,7 +30,7 @@ async function main() { const vmQueryOptions: FilterOptions = { cru: 1, mru: 1, // GB - sru: 10, + sru: 14, availableFor: grid3.twinId, farmId: 1, }; diff --git a/packages/grid_client/scripts/orchestrators/kubernetes_leader.ts b/packages/grid_client/scripts/orchestrators/kubernetes_leader.ts index 7960ee5176..92943b543b 100644 --- a/packages/grid_client/scripts/orchestrators/kubernetes_leader.ts +++ b/packages/grid_client/scripts/orchestrators/kubernetes_leader.ts @@ -30,7 +30,7 @@ async function main() { const masterQueryOptions: FilterOptions = { cru: 2, mru: 2, // GB - sru: 2, + sru: 6, availableFor: grid3.twinId, farmId: 1, }; @@ -38,7 +38,7 @@ async function main() { const workerQueryOptions: FilterOptions = { cru: 1, mru: 1, // GB - sru: 1, + sru: 3, availableFor: grid3.twinId, farmId: 1, }; diff --git a/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts b/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts index f617a631f7..65080b3eec 100644 --- a/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts +++ b/packages/grid_client/scripts/orchestrators/kubernetes_with_qsfs.ts @@ -46,7 +46,7 @@ async function main() { const masterQueryOptions: FilterOptions = { cru: 2, mru: 2, // GB - sru: 2, + sru: 6, availableFor: grid3.twinId, farmId: 1, }; @@ -54,13 +54,13 @@ async function main() { const workerQueryOptions: FilterOptions = { cru: 1, mru: 1, // GB - sru: 1, + sru: 3, availableFor: grid3.twinId, farmId: 1, }; const qsfsQueryOptions: FilterOptions = { - hru: 10, + hru: 15, availableFor: grid3.twinId, farmId: 1, }; diff --git a/packages/grid_client/scripts/vm_with_qsfs.ts b/packages/grid_client/scripts/vm_with_qsfs.ts index bdae4293e6..1f0821c6c4 100644 --- a/packages/grid_client/scripts/vm_with_qsfs.ts +++ b/packages/grid_client/scripts/vm_with_qsfs.ts @@ -46,13 +46,13 @@ async function main() { const vmQueryOptions: FilterOptions = { cru: 1, mru: 1, // GB - sru: 5, + sru: 7, availableFor: grid3.twinId, farmId: 1, }; const qsfsQueryOptions: FilterOptions = { - hru: 10, + hru: 15, availableFor: grid3.twinId, farmId: 1, }; diff --git a/packages/grid_client/scripts/zdb.ts b/packages/grid_client/scripts/zdb.ts index e696f78c01..db2088e081 100644 --- a/packages/grid_client/scripts/zdb.ts +++ b/packages/grid_client/scripts/zdb.ts @@ -28,8 +28,8 @@ async function main() { const grid3 = await getClient(`zdb/${name}`); const zdbQueryOptions: FilterOptions = { - sru: 1, - hru: 1, + sru: 3, + hru: 3, availableFor: grid3.twinId, farmId: 1, };