Skip to content
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
16 changes: 14 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,25 @@ jobs:
echo "waiting on revision ${revision}"

dump_revision_logs() {
echo "----- revision ${revision} console logs -----"
az containerapp logs show \
echo "----- revision ${revision} details -----"
az containerapp revision show \
--name "${{ vars.AZURE_CONTAINERAPP_NAME }}" \
--resource-group "${{ vars.AZURE_RESOURCE_GROUP }}" \
--revision "$revision" \
--query "{state:properties.runningState,health:properties.healthState,replicas:properties.replicas,image:properties.template.containers[0].image}" \
-o json || true
echo "----- console logs (app) -----"
az containerapp logs show \
--name "${{ vars.AZURE_CONTAINERAPP_NAME }}" \
--resource-group "${{ vars.AZURE_RESOURCE_GROUP }}" \
--type console \
--tail 120 || true
echo "----- system logs -----"
az containerapp logs show \
--name "${{ vars.AZURE_CONTAINERAPP_NAME }}" \
--resource-group "${{ vars.AZURE_RESOURCE_GROUP }}" \
--type system \
--tail 80 || true
}

for attempt in $(seq 1 40); do
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using Azure.Data.Tables;
using DigitalBrain.Abstractions;
using DigitalBrain.Core;
using DigitalBrain.ServiceDefaults;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Orleans.Configuration;
Expand Down Expand Up @@ -31,6 +33,7 @@ public static IHostApplicationBuilder AddDigitalBrain(
builder.AddKeyedAzureBlobServiceClient(DigitalBrainNames.GrainState);
builder.UseOrleans(silo =>
{
ConfigureStandaloneAzureClustering(silo, builder.Configuration);
silo.Services.AddKeyedSingleton<IGrainStorageSerializer>(
DigitalBrainNames.DefaultGrainStorage,
static (services, _) => new OrleansGrainStorageSerializer(
Expand All @@ -48,4 +51,36 @@ public static IHostApplicationBuilder AddDigitalBrain(
builder.AddDigitalBrainOwner(activateOnStart: false);
return builder;
}

// Aspire AppHost injects Orleans:Clustering:ProviderType via WithClustering. Published
// containers set DigitalBrain:Standalone and may only have ConnectionStrings:* — wire
// Azure membership/reminders explicitly so the silo does not depend on Aspire DCP env.
private static void ConfigureStandaloneAzureClustering(ISiloBuilder silo, IConfiguration configuration)
{
var standalone = configuration.GetValue("DigitalBrain:Standalone", false);
if (!standalone && !string.IsNullOrWhiteSpace(configuration["Orleans:Clustering:ProviderType"]))
{
return;
}

var clustering = configuration.GetConnectionString(DigitalBrainNames.Clustering);
if (string.IsNullOrWhiteSpace(clustering))
{
if (standalone)
{
throw new InvalidOperationException(
$"Missing connection string '{DigitalBrainNames.Clustering}'. "
+ "Standalone hosts require Azure Table clustering.");
}

return;
}

silo.UseAzureStorageClustering(options =>
options.TableServiceClient = new TableServiceClient(clustering));

var reminders = configuration.GetConnectionString(DigitalBrainNames.Reminders)
?? clustering;
silo.UseAzureTableReminderService(reminders);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
</PropertyGroup>
<ItemGroup>
<ContainerPort Include="8080" Type="tcp" />
<ContainerEnvironmentVariable Include="DigitalBrain__Standalone" Value="true" />
<ContainerEnvironmentVariable Include="DigitalBrain__Modules__0" Value="DigitalBrain.AI.AIModule, DigitalBrain.Modules.AI" />
<ContainerEnvironmentVariable Include="DigitalBrain__Modules__1" Value="DigitalBrain.Memory.MemoryModule, DigitalBrain.Modules.Memory" />
<ContainerEnvironmentVariable Include="DigitalBrain__Modules__2" Value="DigitalBrain.Time.TimeModule, DigitalBrain.Modules.Time" />
Expand Down