ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-17 02:51:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

[SKU Recommendation] Remove the creation of malformed SqlDB recommendations (#1681)

Browse Source 
* Remove the creation of malformed SqlDB recommendations when creating an SKU recommendation report.

* format line
This commit is contained in:
junierch
2022-11-03 15:46:05 -04:00
committed by GitHub
parent dea18a59e0
commit 1aae1d81f2
1 changed files with 1 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Microsoft.SqlTools.ServiceLayer/Migration/MigrationService.cs
View File

@@ -344,26 +344,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Migration
prefs.EligibleSkuCategories = GetEligibleSkuCategories("AzureSqlDatabase", parameters.IncludePreviewSkus); prefs.EligibleSkuCategories = GetEligibleSkuCategories("AzureSqlDatabase", parameters.IncludePreviewSkus);
resultSet.sqlDbResults = provider.GetSkuRecommendation(prefs, req); resultSet.sqlDbResults = provider.GetSkuRecommendation(prefs, req);
if (resultSet.sqlDbResults.Count < parameters.DatabaseAllowList.Count)
{
// if there are fewer recommendations than expected, find which databases didn't have a result generated and create a result with a null SKU
List<string> databasesWithRecommendation = resultSet.sqlDbResults.Select(db => db.DatabaseName).ToList();
foreach (var databaseWithoutRecommendation in parameters.DatabaseAllowList.Where(db => !databasesWithRecommendation.Contains(db)))
{
resultSet.sqlDbResults.Add(new SkuRecommendationResult()
{
//SqlInstanceName = sqlDbResults.FirstOrDefault().SqlInstanceName,
SqlInstanceName = parameters.TargetSqlInstance,
DatabaseName = databaseWithoutRecommendation,
TargetSku = null,
MonthlyCost = null,
Ranking = -1,
PositiveJustifications = null,
NegativeJustifications = null,
});
}
}
sqlDbStopwatch.Stop(); sqlDbStopwatch.Stop();
resultSet.sqlDbDurationInMs = sqlDbStopwatch.ElapsedMilliseconds; resultSet.sqlDbDurationInMs = sqlDbStopwatch.ElapsedMilliseconds;
@@ -479,26 +459,6 @@ namespace Microsoft.SqlTools.ServiceLayer.Migration
DbSkuRecParams DbSkuRecParams = new DbSkuRecParams(pi.SqlDbSpec, elasticaggregator.DatabaseTs, pi.DbLookupTable, Convert.ToDouble(parameters.ScalingFactor) / 100.0, parameters.TargetSqlInstance); DbSkuRecParams DbSkuRecParams = new DbSkuRecParams(pi.SqlDbSpec, elasticaggregator.DatabaseTs, pi.DbLookupTable, Convert.ToDouble(parameters.ScalingFactor) / 100.0, parameters.TargetSqlInstance);
resultSet.sqlDbResults = pi.ElasticStrategyGetSkuRecommendation(MiSkuRecParams, DbSkuRecParams, req); resultSet.sqlDbResults = pi.ElasticStrategyGetSkuRecommendation(MiSkuRecParams, DbSkuRecParams, req);
if (resultSet.sqlDbResults.Count < parameters.DatabaseAllowList.Count)
{
// if there are fewer recommendations than expected, find which databases didn't have a result generated and create a result with a null SKU
List<string> databasesWithRecommendation = resultSet.sqlDbResults.Select(db => db.DatabaseName).ToList();
foreach (var databaseWithoutRecommendation in parameters.DatabaseAllowList.Where(db => !databasesWithRecommendation.Contains(db)))
{
resultSet.sqlDbResults.Add(new SkuRecommendationResult()
{
//SqlInstanceName = sqlDbResults.FirstOrDefault().SqlInstanceName,
SqlInstanceName = parameters.TargetSqlInstance,
DatabaseName = databaseWithoutRecommendation,
TargetSku = null,
MonthlyCost = null,
Ranking = -1,
PositiveJustifications = null,
NegativeJustifications = null,
});
}
}
sqlDbStopwatch.Stop(); sqlDbStopwatch.Stop();
resultSet.sqlDbDurationInMs = sqlDbStopwatch.ElapsedMilliseconds; resultSet.sqlDbDurationInMs = sqlDbStopwatch.ElapsedMilliseconds;
@@ -754,6 +714,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Migration
AzureSqlPaaSServiceTier.GeneralPurpose, AzureSqlPaaSServiceTier.GeneralPurpose,
ComputeTier.Provisioned, ComputeTier.Provisioned,
AzureSqlPaaSHardwareType.Gen5)); AzureSqlPaaSHardwareType.Gen5));
eligibleSkuCategories.Add(new AzureSqlSkuPaaSCategory( eligibleSkuCategories.Add(new AzureSqlSkuPaaSCategory(
AzureSqlTargetPlatform.AzureSqlDatabase, AzureSqlTargetPlatform.AzureSqlDatabase,
AzureSqlPurchasingModel.vCore, AzureSqlPurchasingModel.vCore,