fixed 2 bugs and updated profile naming (#304)

Co-authored-by: Kayvon Tadj <[email protected]>

Author: kayvontadj

src/VirtualClient/VirtualClient.Actions.FunctionalTests/HammerDBProfileTests.cs

@@ -239,6 +239,9 @@ private IEnumerable<string> GetUnixProfileExpectedCommands(bool singleVM)
 
                     $"python3 {this.postgreSQLPackagePath}/distribute-database.py --dbName hammerdbtest --directories {currentDirectory}/mnt_vc_0;{currentDirectory}/mnt_vc_1;{currentDirectory}/mnt_vc_2; --password [A-Za-z0-9+/=]+",
 
+                    $"python3 {this.hammerdbPackagePath}/configure-workload-generator.py --workload tpcc --sqlServer postgresql --port 5432 --virtualUsers [0-9]+ --warehouseCount [0-9]+ --password [A-Za-z0-9+/=]+ --dbName hammerdbtest --hostIPAddress",
+                    $"python3 {this.hammerdbPackagePath}/populate-database.py --createDBTCLPath createDB.tcl",
+
                     $"python3 {this.hammerdbPackagePath}/run-workload.py --runTransactionsTCLFilePath runTransactions.tcl",
                 };
             }
@@ -273,6 +276,9 @@ private IEnumerable<string> GetWindowsProfileExpectedCommands(bool singleVM)
 
                     $"python3 {tempPostgreSqlPackagePath}/distribute-database.py --dbName hammerdbtest --directories E:\\\\;F:\\\\;G:\\\\; --password [A-Za-z0-9+/=]+",
 
+                    $"python3 {temphammerdbPackagePath}/configure-workload-generator.py --workload tpcc --sqlServer postgresql --port 5432 --virtualUsers [0-9]+ --warehouseCount [0-9]+ --password [A-Za-z0-9+/=]+ --dbName hammerdbtest --hostIPAddress",
+                    $"python3 {this.hammerdbPackagePath}/populate-database.py --createDBTCLPath createDB.tcl",
+
                     $"python3 {this.hammerdbPackagePath}/run-workload.py --runTransactionsTCLFilePath runTransactions.tcl",
                 };
             }

src/VirtualClient/VirtualClient.Actions/HammerDB/HammerDBExecutor.cs

@@ -198,16 +198,16 @@ protected override async Task ExecuteAsync(EventContext telemetryContext, Cancel
             HammerDBState state = await this.stateManager.GetStateAsync<HammerDBState>(nameof(HammerDBState), cancellationToken)
                ?? new HammerDBState();
 
-            if (!state.DatabaseCreated)
+            if (state.DatabaseCreated != 2)
             {
-                await this.Logger.LogMessageAsync($"{this.TypeName}.CreateDatabase", telemetryContext.Clone(), async () =>
+                await this.Logger.LogMessageAsync($"{this.TypeName}.{this.Scenario}", telemetryContext.Clone(), async () =>
                 {
                     if (!cancellationToken.IsCancellationRequested)
                     {
                         await this.PrepareSQLDatabase(telemetryContext, cancellationToken);
                     }
                 });
-                state.DatabaseCreated = true;
+                state.DatabaseCreated++;
                 await this.stateManager.SaveStateAsync<HammerDBState>(nameof(HammerDBState), state, cancellationToken);
             }
         }
@@ -399,11 +399,11 @@ public bool HammerDBInitialized
                 }
             }
 
-            public bool DatabaseCreated
+            public int DatabaseCreated
             {
                 get
                 {
-                    return this.Properties.GetValue<bool>(nameof(HammerDBState.DatabaseCreated), false);
+                    return this.Properties.GetValue<int>(nameof(HammerDBState.DatabaseCreated), 0);
                 }
 
                 set

src/VirtualClient/VirtualClient.Main/profiles/PERF-POSTGRESQL-HAMMERDB-TPCC.json

@@ -110,7 +110,7 @@
     {
       "Type": "HammerDBExecutor",
       "Parameters": {
-        "Scenario": "PopulatePostgreSQLDatabase",
+        "Scenario": "CreatePostgreSQLDatabase",
         "DatabaseName": "$.Parameters.DatabaseName",
         "Workload": "tpcc",
         "SQLServer": "postgresql",