Bug#32712389 FIXES THE PROPERTY TO RESTART MGMDS IN EXPECTED MANNER

VarunNagaraju · VarunNagaraju · commit 89337c8bd363 · 2021-04-14T15:25:05.000+05:30
Modifies testUpgrade.cpp to fix the case sensitive property name,
'InitialMgmdRestart' for some test cases.

InitialMgmdRestart is a property which acts as a control variable
in deciding the type of restart to be performed on management nodes
for upgrading/downgrading the cluster. For some test cases, it was
being incorrectly set(InitialMGMDRestart) which led to Upgrade_NR1
and Upgrade_Api_Before_NR1 to restart mgmds without --initial as
opposed to with --initial which is the expected behaviour.

Change-Id: I8c85546f3bb56ac84c218c279455094a1398dc8a
diff --git a/storage/ndb/test/ndbapi/testUpgrade.cpp b/storage/ndb/test/ndbapi/testUpgrade.cpp
@@ -2319,7 +2319,7 @@ POSTUPGRADE("ShowVersions")
 };
 TESTCASE("Upgrade_NR1",
 	 "Test that one node at a time can be upgraded"){
-  TC_PROPERTY("InitialMGMDRestart", Uint32(1));
+  TC_PROPERTY("InitialMgmdRestart", Uint32(1));
   INITIALIZER(runCheckStarted);
   INITIALIZER(runReadVersions);
   INITIALIZER(checkForUpgrade);
@@ -2329,7 +2329,7 @@ TESTCASE("Upgrade_NR1",
 }
 POSTUPGRADE("Upgrade_NR1")
 {
-  TC_PROPERTY("InitialMGMDRestart", Uint32(1));
+  TC_PROPERTY("InitialMgmdRestart", Uint32(1));
   INITIALIZER(runCheckStarted);
   INITIALIZER(runPostUpgradeChecks);
 }
@@ -2480,7 +2480,7 @@ TESTCASE("Upgrade_Api_Before_NR1",
 }
 POSTUPGRADE("Upgrade_Api_Before_NR1")
 {
-  TC_PROPERTY("InitialMGMDRestart", Uint32(1));
+  TC_PROPERTY("InitialMgmdRestart", Uint32(1));
   INITIALIZER(runCheckStarted);
   INITIALIZER(runPostUpgradeDecideDDL);
   INITIALIZER(runGetTableList);
@@ -2690,7 +2690,7 @@ TESTCASE("Downgrade_NR2_WithMGMDInitialStart",
 }
 POSTUPGRADE("Downgrade_NR2_WithMGMDInitialStart")
 {
-  TC_PROPERTY("InitialMGMDRestart", Uint32(1));
+  TC_PROPERTY("InitialMgmdRestart", Uint32(1));
   INITIALIZER(runCheckStarted);
   INITIALIZER(runPostUpgradeChecks);
 }
@@ -2722,7 +2722,7 @@ TESTCASE("Downgrade_NR3_WithMGMDInitialStart",
 }
 POSTUPGRADE("Downgrade_NR3_WithMGMDInitialStart")
 {
-  TC_PROPERTY("InitialMGMDRestart", Uint32(1));
+  TC_PROPERTY("InitialMgmdRestart", Uint32(1));
   INITIALIZER(runCheckStarted);
   INITIALIZER(runPostUpgradeChecks);
 }
@@ -2764,7 +2764,7 @@ TESTCASE("Downgrade_FS_WithMGMDInitialStart",
 }
 POSTUPGRADE("Downgrade_FS_WithMGMDInitialStart")
 {
-  TC_PROPERTY("InitialMGMDRestart", Uint32(1));
+  TC_PROPERTY("InitialMgmdRestart", Uint32(1));
   INITIALIZER(runCheckStarted);
   INITIALIZER(runPostUpgradeChecks);
 }

Original file line number	Diff line number	Diff line change
`@@ -2319,7 +2319,7 @@ POSTUPGRADE("ShowVersions")`
`2319`	`2319`	`};`
`2320`	`2320`	`TESTCASE("Upgrade_NR1",`
`2321`	`2321`	`"Test that one node at a time can be upgraded"){`
`2322`		`- TC_PROPERTY("InitialMGMDRestart", Uint32(1));`
	`2322`	`+ TC_PROPERTY("InitialMgmdRestart", Uint32(1));`
`2323`	`2323`	`INITIALIZER(runCheckStarted);`
`2324`	`2324`	`INITIALIZER(runReadVersions);`
`2325`	`2325`	`INITIALIZER(checkForUpgrade);`
`@@ -2329,7 +2329,7 @@ TESTCASE("Upgrade_NR1",`
`2329`	`2329`	`}`
`2330`	`2330`	`POSTUPGRADE("Upgrade_NR1")`
`2331`	`2331`	`{`
`2332`		`- TC_PROPERTY("InitialMGMDRestart", Uint32(1));`
	`2332`	`+ TC_PROPERTY("InitialMgmdRestart", Uint32(1));`
`2333`	`2333`	`INITIALIZER(runCheckStarted);`
`2334`	`2334`	`INITIALIZER(runPostUpgradeChecks);`
`2335`	`2335`	`}`
`@@ -2480,7 +2480,7 @@ TESTCASE("Upgrade_Api_Before_NR1",`
`2480`	`2480`	`}`
`2481`	`2481`	`POSTUPGRADE("Upgrade_Api_Before_NR1")`
`2482`	`2482`	`{`
`2483`		`- TC_PROPERTY("InitialMGMDRestart", Uint32(1));`
	`2483`	`+ TC_PROPERTY("InitialMgmdRestart", Uint32(1));`
`2484`	`2484`	`INITIALIZER(runCheckStarted);`
`2485`	`2485`	`INITIALIZER(runPostUpgradeDecideDDL);`
`2486`	`2486`	`INITIALIZER(runGetTableList);`
`@@ -2690,7 +2690,7 @@ TESTCASE("Downgrade_NR2_WithMGMDInitialStart",`
`2690`	`2690`	`}`
`2691`	`2691`	`POSTUPGRADE("Downgrade_NR2_WithMGMDInitialStart")`
`2692`	`2692`	`{`
`2693`		`- TC_PROPERTY("InitialMGMDRestart", Uint32(1));`
	`2693`	`+ TC_PROPERTY("InitialMgmdRestart", Uint32(1));`
`2694`	`2694`	`INITIALIZER(runCheckStarted);`
`2695`	`2695`	`INITIALIZER(runPostUpgradeChecks);`
`2696`	`2696`	`}`
`@@ -2722,7 +2722,7 @@ TESTCASE("Downgrade_NR3_WithMGMDInitialStart",`
`2722`	`2722`	`}`
`2723`	`2723`	`POSTUPGRADE("Downgrade_NR3_WithMGMDInitialStart")`
`2724`	`2724`	`{`
`2725`		`- TC_PROPERTY("InitialMGMDRestart", Uint32(1));`
	`2725`	`+ TC_PROPERTY("InitialMgmdRestart", Uint32(1));`
`2726`	`2726`	`INITIALIZER(runCheckStarted);`
`2727`	`2727`	`INITIALIZER(runPostUpgradeChecks);`
`2728`	`2728`	`}`
`@@ -2764,7 +2764,7 @@ TESTCASE("Downgrade_FS_WithMGMDInitialStart",`
`2764`	`2764`	`}`
`2765`	`2765`	`POSTUPGRADE("Downgrade_FS_WithMGMDInitialStart")`
`2766`	`2766`	`{`
`2767`		`- TC_PROPERTY("InitialMGMDRestart", Uint32(1));`
	`2767`	`+ TC_PROPERTY("InitialMgmdRestart", Uint32(1));`
`2768`	`2768`	`INITIALIZER(runCheckStarted);`
`2769`	`2769`	`INITIALIZER(runPostUpgradeChecks);`
`2770`	`2770`	`}`