ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Partial checkin

Browse Source
This commit is contained in:
ericuss 2019-08-05 14:21:58 +02:00
parent aedd0e38e9
commit 44af7aa8d2
4 changed files with 97 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs
View File

@ -60,6 +60,7 @@ namespace Microsoft.AspNetCore.Hosting
}
catch (Exception ex)
{
Console.WriteLine(ex.Message.ToString() + "An error occurred while migrating the database used on context {DbContextName}" + typeof(TContext).Name);
logger.LogError(ex, "An error occurred while migrating the database used on context {DbContextName}", typeof(TContext).Name);
if (underK8s)
{
@ -71,11 +72,72 @@ namespace Microsoft.AspNetCore.Hosting
return webHost;
}
public static IWebHost RemoveDbContext<TContext>(this IWebHost webHost) where TContext : DbContext
{
var underK8s = webHost.IsInKubernetes();
using (var scope = webHost.Services.CreateScope())
{
var services = scope.ServiceProvider;
var logger = services.GetRequiredService<ILogger<TContext>>();
var context = services.GetService<TContext>();
try
{
logger.LogInformation("Deleting the database associated with context {DbContextName}" + typeof(TContext).Name);
if (underK8s)
{
InvokeRemover(context);
}
else
{
var retries = 10;
var retry = Policy.Handle<SqlException>()
.WaitAndRetry(
retryCount: retries,
sleepDurationProvider: retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)),
onRetry: (exception, timeSpan, retry, ctx) =>
{
Console.WriteLine(" --RETRYING Exception " + exception.Message.ToString());
logger.LogWarning(exception, "[{prefix}] Exception {ExceptionType} with message {Message} detected on attempt {retry} of {retries}", nameof(TContext), exception.GetType().Name, exception.Message, retry, retries);
});
//if the sql server container is not created on run docker compose this
//migration can't fail for network related exception. The retry options for DbContext only
//apply to transient exceptions
// Note that this is NOT applied when running some orchestrators (let the orchestrator to recreate the failing service)
retry.Execute(() => InvokeRemover(context));
}
Console.WriteLine("Deleted database associated with context {DbContextName}", typeof(TContext).Name);
logger.LogInformation("Deleted database associated with context {DbContextName}", typeof(TContext).Name);
}
catch (Exception ex)
{
Console.WriteLine(ex.Message.ToString() + "An error occurred while deleting the database used on context {DbContextName}" + typeof(TContext).Name);
logger.LogError(ex, "An error occurred while deleting the database used on context {DbContextName}", typeof(TContext).Name);
if (underK8s)
{
throw; // Rethrow under k8s because we rely on k8s to re-run the pod
}
}
}
return webHost;
}
private static void InvokeSeeder<TContext>(Action<TContext, IServiceProvider> seeder, TContext context, IServiceProvider services)
where TContext : DbContext
{
context.Database.Migrate();
seeder(context, services);
}
private static void InvokeRemover<TContext>(TContext context)
where TContext : DbContext
{
context.Database.EnsureDeleted();
}
}
}

1
src/Services/Marketing/Marketing.API/Infrastructure/MarketingContext.cs
View File

@ -38,6 +38,7 @@
var connectionString = configuration["ConnectionString"];
Console.WriteLine(" -- Connection string");
Console.WriteLine(connectionString);
var optionsBuilder = new DbContextOptionsBuilder<MarketingContext>()
.UseSqlServer(connectionString);
// .UseSqlServer("Server=.;Initial Catalog=Microsoft.eShopOnContainers.Services.MarketingDb;Integrated Security=true");

4
src/Services/Marketing/Marketing.FunctionalTests/CampaignScenarios.cs
View File

@ -75,7 +75,7 @@ namespace Marketing.FunctionalTests
var campaignResponse = await server.CreateClient()
.PostAsync(Post.AddNewCampaign, content);
if (int.TryParse(campaignResponse.Headers.Location.Segments[4], out int id))
if (int.TryParse(campaignResponse.Headers.Location.Segments[3], out int id))
{
var response = await server.CreateClient()
.DeleteAsync(Delete.CampaignBy(id));
@ -99,7 +99,7 @@ namespace Marketing.FunctionalTests
var campaignResponse = await server.CreateClient()
.PostAsync(Post.AddNewCampaign, content);
if (int.TryParse(campaignResponse.Headers.Location.Segments[4], out int id))
if (int.TryParse(campaignResponse.Headers.Location.Segments[3], out int id))
{
fakeCampaignDto.Description = "FakeCampaignUpdatedDescription";
content = new StringContent(JsonConvert.SerializeObject(fakeCampaignDto), Encoding.UTF8, "application/json");

34
src/Services/Marketing/Marketing.FunctionalTests/MarketingScenarioBase.cs
View File

@ -1,11 +1,16 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.TestHost;
using Microsoft.eShopOnContainers.Services.Marketing.API;
using Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using System;
using System.IO;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
namespace Marketing.FunctionalTests
{
@ -15,29 +20,54 @@ namespace Marketing.FunctionalTests
public TestServer CreateServer()
{
Console.WriteLine(" Creating test server");
var path = Assembly.GetAssembly(typeof(MarketingScenarioBase))
.Location;
Console.WriteLine(" Creating builder");
var hostBuilder = new WebHostBuilder()
.UseContentRoot(Path.GetDirectoryName(path))
.ConfigureAppConfiguration(cb =>
{
cb.AddJsonFile("appsettings.json", optional: false)
var h = cb.AddJsonFile("appsettings.json", optional: false)
.AddEnvironmentVariables();
}).UseStartup<MarketingTestsStartup>();
})
.CaptureStartupErrors(true)
.UseStartup<MarketingTestsStartup>();
Console.WriteLine(" Created builder");
var testServer = new TestServer(hostBuilder);
using (var scope = testServer.Services.CreateScope())
{
var services = scope.ServiceProvider;
var logger = services.GetRequiredService<ILogger<MarketingScenarioBase>>();
var settings = services.GetRequiredService<IOptions<MarketingSettings>>();
logger.LogError("connectionString " + settings.Value.ConnectionString);
Console.WriteLine("connectionString " + settings.Value.ConnectionString);
}
testServer.Host
.RemoveDbContext<MarketingContext>()
.MigrateDbContext<MarketingContext>((context, services) =>
{
var logger = services.GetService<ILogger<MarketingContextSeed>>();
logger.LogError("Migrating MarketingContextSeed");
new MarketingContextSeed()
.SeedAsync(context, logger)
.Wait();
});
Console.WriteLine(" Thread to sleep");
Thread.Sleep(5000);
Console.WriteLine(" Thread after");
return testServer;
}