Skip to content

Commit 244306c

Browse files
committed
a fix for arm64 hammerdb
1 parent 500160b commit 244306c

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -229,21 +229,25 @@ await this.CheckDistroSupportAsync(cancellationToken)
229229
.ConfigureAwait(false);
230230

231231
await HammerDBExecutor.OpenFirewallPortsAsync(this.Port, this.SystemManager.FirewallManager, cancellationToken);
232-
233-
DependencyPath hammerDBPackage = await this.GetPlatformSpecificPackageAsync(this.PackageName, cancellationToken);
234-
this.HammerDBPackagePath = hammerDBPackage.Path;
235-
236-
await this.InitializeExecutablesAsync(telemetryContext, cancellationToken);
237-
232+
238233
this.InitializeApiClients(cancellationToken);
239234

240-
await this.Logger.LogMessageAsync($"{this.TypeName}.ConfigureHammerDBFile", telemetryContext.Clone(), async () =>
235+
// Only load HammerDB package for x64 executors.
236+
if (this.CpuArchitecture == System.Runtime.InteropServices.Architecture.X64)
241237
{
242-
if (!cancellationToken.IsCancellationRequested)
238+
DependencyPath hammerDBPackage = await this.GetPlatformSpecificPackageAsync(this.PackageName, cancellationToken);
239+
this.HammerDBPackagePath = hammerDBPackage.Path;
240+
241+
await this.InitializeExecutablesAsync(telemetryContext, cancellationToken);
242+
243+
await this.Logger.LogMessageAsync($"{this.TypeName}.ConfigureHammerDBFile", telemetryContext.Clone(), async () =>
243244
{
244-
await this.ConfigureCreateHammerDBFile(telemetryContext, cancellationToken);
245-
}
246-
});
245+
if (!cancellationToken.IsCancellationRequested)
246+
{
247+
await this.ConfigureCreateHammerDBFile(telemetryContext, cancellationToken);
248+
}
249+
});
250+
}
247251

248252
if (this.IsMultiRoleLayout())
249253
{
@@ -252,7 +256,7 @@ await this.Logger.LogMessageAsync($"{this.TypeName}.ConfigureHammerDBFile", tele
252256

253257
this.ThrowIfLayoutClientIPAddressNotFound(layoutIPAddress);
254258
this.ThrowIfRoleNotSupported(clientInstance.Role);
255-
}
259+
}
256260
}
257261

258262
/// <summary>

0 commit comments

Comments
 (0)