From 8de91c335e4d25ff6d18f2b404a6da28f6acd87d Mon Sep 17 00:00:00 2001 From: Carl Xie Date: Mon, 8 Aug 2022 17:08:30 -0700 Subject: [PATCH 1/2] Fix bug #104 --- .../test/resourceRegionMgrSimulator/main.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/resource-management/test/resourceRegionMgrSimulator/main.go b/resource-management/test/resourceRegionMgrSimulator/main.go index 5b0e31b6..99ae46ca 100644 --- a/resource-management/test/resourceRegionMgrSimulator/main.go +++ b/resource-management/test/resourceRegionMgrSimulator/main.go @@ -30,6 +30,23 @@ func main() { flag.Parse() } + // Input parameter error handling for c.RpNum and c.NodesPerRP + // Fix bug #104 + if c.RpNum < 1 || c.NodesPerRP < 1 { + klog.Info("") + + if c.RpNum < 1 { + klog.Errorf("Error: Region resource manager simulator config / rp number per region: (%v) is less than 1", c.RpNum) + } + + if c.NodesPerRP < 1 { + klog.Errorf("Error: Region resource manager simulator config / node number per rp: (%v) is less than 1", c.NodesPerRP) + } + + klog.Info("") + os.Exit(1) + } + // Keep a more frequent flush frequency as 1 second klog.StartFlushDaemon(time.Second * 1) From c4dab701c023f86ce67d53298e6eaf8a996afbd6 Mon Sep 17 00:00:00 2001 From: Carl Xie Date: Tue, 9 Aug 2022 11:23:14 -0700 Subject: [PATCH 2/2] Minor changes based on feedback --- .../test/resourceRegionMgrSimulator/main.go | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/resource-management/test/resourceRegionMgrSimulator/main.go b/resource-management/test/resourceRegionMgrSimulator/main.go index 99ae46ca..009e5120 100644 --- a/resource-management/test/resourceRegionMgrSimulator/main.go +++ b/resource-management/test/resourceRegionMgrSimulator/main.go @@ -32,20 +32,17 @@ func main() { // Input parameter error handling for c.RpNum and c.NodesPerRP // Fix bug #104 - if c.RpNum < 1 || c.NodesPerRP < 1 { - klog.Info("") - - if c.RpNum < 1 { - klog.Errorf("Error: Region resource manager simulator config / rp number per region: (%v) is less than 1", c.RpNum) - } - - if c.NodesPerRP < 1 { - klog.Errorf("Error: Region resource manager simulator config / node number per rp: (%v) is less than 1", c.NodesPerRP) - } + klog.Info("") + if c.RpNum < 1 { + klog.Errorf("Error: Region resource manager simulator config / rp number per region: (%v) is less than 1", c.RpNum) + os.Exit(1) + } - klog.Info("") + if c.NodesPerRP < 1 { + klog.Errorf("Error: Region resource manager simulator config / node number per rp: (%v) is less than 1", c.NodesPerRP) os.Exit(1) } + klog.Info("") // Keep a more frequent flush frequency as 1 second klog.StartFlushDaemon(time.Second * 1)