Skip to content

fixing DeathStarbench issue #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yangpanMS merged 2 commits into from
Jun 6, 2024
Merged

fixing DeathStarbench issue #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98879ee
fixing DeathStarbench issue
nmalkapuram Jun 5, 2024
d321f33
updating unittests
nmalkapuram Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...lient/VirtualClient.Actions.UnitTests/DeathStarBench/DeathStarBenchClientExecutorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ public async Task DeathStarBenchClientExecutorExecutesExpectedCommands_SocialNet
$"sudo bash {this.mockPath.Path}/linux-x64/scripts/isSwarmNode.sh",
$"sudo bash {this.mockPath.Path}/linux-x64/scripts/isSwarmNode.sh",
$"sudo --join-swarm", // mock command but illustrates the idea of the command that should be called
$"sudo make clean",
$"sudo make",
$"sudo bash -c \"./wrk -D exp -t 20 -c 1000 -d 600s -L -s ./scripts/social-network/compose-post.lua http://localhost:8080/wrk2-api/post/compose -R 1000 >> results.txt\"",
$"sudo bash -c \"./wrk -D exp -t 20 -c 1000 -d 600s -L -s ./scripts/social-network/read-home-timeline.lua http://localhost:8080/wrk2-api/home-timeline/read -R 1000 >> results.txt\"",
Expand Down Expand Up @@ -137,6 +138,7 @@ public async Task DeathStarBenchClientExecutorExecutesExpectedCommands_MediaMicr
// On Unix/Linux systems, everything will be case-sensitive. As such the commands below are expected to be
// exactly the same as what is executed.
$"sudo chmod +x \"{this.mockPath.Path}/linux-x64/mediamicroservices/wrk2/wrk\"",
$"sudo chmod +x \"{this.mockPath.Path}/linux-x64/mediamicroservices/wrk2/deps/luajit/src/luajit\"",
$"sudo bash {this.mockPath.Path}/linux-x64/scripts/dockerComposeScript.sh",
$"sudo chmod +x \"/usr/local/bin/docker-compose\"",
$"sudo python3 -m pip install -U pip",
Expand All @@ -146,6 +148,7 @@ public async Task DeathStarBenchClientExecutorExecutesExpectedCommands_MediaMicr
$"sudo bash {this.mockPath.Path}/linux-x64/scripts/isSwarmNode.sh",
$"sudo bash {this.mockPath.Path}/linux-x64/scripts/isSwarmNode.sh",
$"sudo --join-swarm", // mock command but illustrates the idea of the command that should be called
$"sudo make clean",
$"sudo make",
$"sudo bash -c \"./wrk -D exp -t 20 -c 1000 -d 600s -L -s ./scripts/media-microservices/compose-review.lua http://localhost:8080/wrk2-api/review/compose -R 1000 >> results.txt\"",
$"sudo bash {this.mockPath.Path}/linux-x64/scripts/isSwarmNode.sh",
Expand Down Expand Up @@ -190,6 +193,7 @@ public async Task DeathStarBenchClientExecutorExecutesExpectedCommands_HotelRese
$"sudo bash {this.mockPath.Path}/linux-x64/scripts/isSwarmNode.sh",
$"sudo bash {this.mockPath.Path}/linux-x64/scripts/isSwarmNode.sh",
$"sudo --join-swarm", // mock command but illustrates the idea of the command that should be called
$"sudo make clean",
$"sudo make",
$"sudo bash -c \"./wrk -D exp -t 20 -c 1000 -d 600s -L -s ./scripts/hotel-reservation/mixed-workload_type_1.lua http://0.0.0.0:5000 -R 1000 >> results.txt\"",
$"sudo bash {this.mockPath.Path}/linux-x64/scripts/isSwarmNode.sh",
Expand Down
1 change: 1 addition & 0 deletions src/VirtualClient/VirtualClient.Actions/DeathStarBench/DeathStarBenchClientExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ private async Task ExecuteClientAsync(EventContext telemetryContext, Cancellatio
await this.WaitAsync(DeathStarBenchExecutor.ServerWarmUpTime, cancellationToken);
}

await this.ExecuteCommandAsync("make clean", this.MakefileDirectory, cancellationToken);
await this.ExecuteCommandAsync("make", this.MakefileDirectory, cancellationToken);

foreach (var action in this.actionScript[this.ServiceName].Keys)
Expand Down
6 changes: 6 additions & 0 deletions src/VirtualClient/VirtualClient.Actions/DeathStarBench/DeathStarBenchExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,12 @@ await this.SystemManager.MakeFileExecutableAsync(
this.Combine(this.MakefileDirectory, "wrk"),
this.Platform,
cancellationToken);

await this.SystemManager.MakeFileExecutableAsync(
this.Combine(this.MakefileDirectory, "deps", "luajit", "src", "luajit"),
this.Platform,
cancellationToken);

}

await this.InstallDependenciesAsync(cancellationToken)
Expand Down
2 changes: 1 addition & 1 deletion src/VirtualClient/VirtualClient.Main/profiles/PERF-NETWORK-DEATHSTARBENCH.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"Parameters": {
"Scenario": "InstallDeathStarBenchPackage",
"BlobContainer": "packages",
"BlobName": "deathstarbench.2.0.0.zip",
"BlobName": "deathstarbench.3.0.0.zip",
"PackageName": "deathstarbench",
"Extract": true
}
Expand Down