Skip to content
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.

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

Bug fixes and Batch communication model update #514

Merged
merged 2 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# SQL Build Manager Change Log

### Version 15.6.2
- *UPDATED:* Specifying Batch Node Communication model as `Simplified` (vs. prior default of `Classic`) as [classic is getting retired in 2026](https://azure.microsoft.com/en-us/updates/azure-batch-classic-compute-node-communication-model-will-be-retired-on-31-march-2026/)
- *FIXED:* [GitHub Issue #501](https://github.com/mmckechney/SqlBuildManager/issues/501) - DeleteBatchPool settingsfile setting not honored for batch run commands / logging issue with --deletebatchpool override
- *FIXED:* [GitHub Issue #513](https://github.com/mmckechney/SqlBuildManager/issues/513) - PreStage incorrectly reports batch node readiness if quota has been reached

### Version 15.6.1
- *FIXED:* [GitHub Issue #469](https://github.com/mmckechney/SqlBuildManager/issues/469) - New tables with foreign key constraints not generating the CREATE TABLE statements
- *FIXED:* GitHub Action for container build
Expand Down
2 changes: 1 addition & 1 deletion scripts/templates/Modules/database.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
param namePrefix string = 'eztmwm'

@description('Name for SQL Admin account')
param sqladminname string = 'sqladmin_user'
param sqladminname string = 'SqlBuildManagerSqlAdmin'

@description('Value for SQL Admin password')
@secure()
Expand Down
2 changes: 1 addition & 1 deletion scripts/templates/azuredeploy_main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ param deployAks bool = true
param testDbCountPerServer int = 10

@description('Name for SQL Admin account')
param sqladminname string = 'sqladmin_user'
param sqladminname string = 'SqlBuildManagerSqlAdmin'

@description('Value for SQL Admin password')
@secure()
Expand Down
4 changes: 2 additions & 2 deletions src/AssemblyVersioning.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
// 2) Update the installer version to match the AssemblyVersion below.
// These can be found in SqlBuildManager.Setup -> Organize Your Setup -> General Information

[assembly: AssemblyVersion("15.6.1")]
[assembly: AssemblyFileVersion("15.6.1")]
[assembly: AssemblyVersion("15.6.2")]
[assembly: AssemblyFileVersion("15.6.2")]
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="YamlDotNet" Version="15.1.2" />
<PackageReference Include="YamlDotNet" Version="15.1.4" />
</ItemGroup>
<ItemGroup>
<!--<ProjectReference Include="..\..\..\command-line-api\src\System.CommandLine\System.CommandLine.csproj" />-->
Expand Down
1,710 changes: 870 additions & 840 deletions src/SqlBuildManager.Console/Batch/BatchManager.cs

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/SqlBuildManager.Console/CommandLine/CommandLineBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ private static List<Option> BatchSettingsOptions
}
}
private static Option<string> batchjobnameOption = new Option<string>(new string[] { "--jobname", "--batchjobname" }, "User friendly name for the job. This will also be the container name for the stored logs. Any disallowed URL characters will be removed");
private static Option<bool> deletebatchjobOption = new Option<bool>(new string[] { "--deletebatchjob" }, () => false, "Whether or not to delete the batch job after an execution");
private static Option<bool> deletebatchjobOption = new Option<bool>(new string[] { "--deletebatchjob" }, "Whether or not to delete the batch job after an execution");
private static Option<bool> pollbatchpoolstatusOption = new Option<bool>(new string[] { "--poll", "--pollbatchpoolstatus" }, "Whether or not you want to get updated status (true) or fire and forget (false)");

/// <summary>
Expand Down Expand Up @@ -191,7 +191,7 @@ private static List<Option> BatchComputeOptions
private static Option<string> batchvmsizeOption = new Option<string>(new string[] { "--vmsize", "--batchvmsize" }, "Size key for VM size required (see https://docs.microsoft.com/en-us/azure/virtual-machines/windows/sizes-general) ");
private static Option<string> batchResourceGroupOption = new Option<string>(new string[] { "--batchresourcegroup", "--batchrg" }, "The Resource Group name for the Batch Account");
private static Option<string> batchpoolnameOption = new Option<string>(new string[] { "--poolname", "--batchpoolname" }, "Override for the default pool name of \"SqlBuildManagerPool\"");
private static Option<bool> deletebatchpoolOption = new Option<bool>(new string[] { "--deletebatchpool" }, () => false, "Whether or not to delete the batch pool servers after an execution");
private static Option<bool> deletebatchpoolOption = new Option<bool>(new string[] { "--deletebatchpool" }, "Whether or not to delete the batch pool servers after an execution");
private static Option<string> batchApplicationOption = new Option<string>(new string[] { "--apppackage", "--applicationpackage" }, "The Azure Batch application package name. (Default is 'SqlBuildManagerWindows' for Windows and 'SqlBuildManagerLinux' for Linux");
private static Option<string> outputcontainersasurlOption = new Option<string>(new string[] { "--outputcontainersasurl" }, "[Internal only] Runtime storage SAS url (auto-generated from `sbm batch run` command") { IsHidden = true };
private static Option<int> batchJobMonitorTimeoutMin = new Option<int>(new string[] { "--monitortimeout", "--batchjobmonitortimeout" }, "Timeout (in minutes) for the batch job monitor to wait for the job to complete. Default is 30 minutes");
Expand Down
Loading
Loading