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.

Sign up for GitHub

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

Jump to bottom

Remove timeout on MessageOutboxDeliveryService #437

Merged
merged 5 commits into from
Jul 18, 2024
Merged

Remove timeout on MessageOutboxDeliveryService #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6fa2327
Remove timeout on MessageOutboxDeliveryService
Enkidu93 Jul 17, 2024
32a20c8
I believe this is how multi-indexes should be specified - https://www…
johnml1135 Jul 18, 2024
d8ac34e
Revert compounding of all indices. Remove unused indices. Specify use…
Enkidu93 Jul 18, 2024
817c8a8
Add other recommended index on pretranslations (should revisit this l…
Enkidu93 Jul 18, 2024
9bf9b09
Update docker-compose with Atlas.
johnml1135 Jul 18, 2024
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
40 changes: 22 additions & 18 deletions docker-compose.withatlas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ services:
- ASPNETCORE_Kestrel__Endpoints__Http__Url=http://*:80
- ASPNETCORE_Kestrel__Endpoints__Http2__Url=http://*:81
- ASPNETCORE_Kestrel__Endpoints__Http2__Protocols=Http2
- ASPNETCORE_ConnectionStrings__Hangfire=${MONGO_CONNECTION_STRING:?connection string needed}/${MONGO_CONNECTION_PREFIX:?mongo prefix needed}serval_jobs
- ASPNETCORE_ConnectionStrings__Mongo=${MONGO_CONNECTION_STRING}/${MONGO_CONNECTION_PREFIX}serval
- ASPNETCORE_ConnectionStrings__Hangfire=${MONGO_CONNECTION_STRING:?connection string needed}/${MONGO_CONNECTION_PREFIX:?mongo prefix needed}serval_jobs${MONGO_EXTENSIONS}
- ASPNETCORE_ConnectionStrings__Mongo=${MONGO_CONNECTION_STRING}/${MONGO_CONNECTION_PREFIX}serval${MONGO_EXTENSIONS}
- ASPNETCORE_Translation__Engines__0__Type=Echo
- ASPNETCORE_Translation__Engines__0__Address=http://echo
- ASPNETCORE_Translation__Engines__1__Type=SmtTransfer
Expand Down Expand Up @@ -74,22 +74,24 @@ services:
hostname: machine-engine
container_name: machine-engine-cntr
build:
context: ${MACHINE_TESTING_DIR:-../machine}
dockerfile: ../machine/dockerfile.development
context: .
dockerfile: dockerfile.development

environment:
- ASPNETCORE_ENVIRONMENT=Staging
- ASPNETCORE_Kestrel__Endpoints__Https__Url=http://*:80
- ASPNETCORE_Kestrel__EndpointDefaults__Protocols=Http2
- ASPNETCORE_ConnectionStrings__Hangfire=${MONGO_CONNECTION_STRING}/${MONGO_CONNECTION_PREFIX}machine_jobs
- ASPNETCORE_ConnectionStrings__Mongo=${MONGO_CONNECTION_STRING}/${MONGO_CONNECTION_PREFIX}machine
- ASPNETCORE_ConnectionStrings__Hangfire=${MONGO_CONNECTION_STRING}/${MONGO_CONNECTION_PREFIX}machine_jobs${MONGO_EXTENSIONS}
- ASPNETCORE_ConnectionStrings__Mongo=${MONGO_CONNECTION_STRING}/${MONGO_CONNECTION_PREFIX}machine${MONGO_EXTENSIONS}
- ASPNETCORE_ConnectionStrings__Serval=http://serval-api:81
- ClearML__ApiServer=https://api.sil.hosted.allegro.ai
- ClearML__Queue=lambert_24gb
- ClearML__DockerImage=${MACHINE_PY_IMAGE:-ghcr.io/sillsdev/machine.py:latest}
- ClearML__Project=docker-compose
- "ClearML__AccessKey=${ClearML_AccessKey:?access key needed}"
- "ClearML__SecretKey=${ClearML_SecretKey:?secret key needed}"
- BuildJob__ClearML__0__Queue=lambert_24gb
- BuildJob__ClearML__0__DockerImage=${MACHINE_PY_IMAGE:-ghcr.io/sillsdev/machine.py:latest}
- BuildJob__ClearML__1__Queue=lambert_24gb.cpu_only
- BuildJob__ClearML__1__DockerImage=${MACHINE_PY_CPU_IMAGE:-ghcr.io/sillsdev/machine.py:latest.cpu_only}
- SharedFile__Uri=s3://aqua-ml-data/docker-compose/
- "SharedFile__S3AccessKeyId=${AWS_ACCESS_KEY_ID:?access key needed}"
- "SharedFile__S3SecretAccessKey=${AWS_SECRET_ACCESS_KEY:?secret key needed}"
Expand All @@ -100,11 +102,11 @@ services:
depends_on:
- serval-api
volumes:
- ${MACHINE_TESTING_DIR:-../machine}:/app:ro
- .:/app:ro
- ~/.nuget/packages:/root/.nuget/packages:ro
- /var/lib/machine:/var/lib/machine
- /var/lib/serval:/var/lib/serval
working_dir: '/app/src/SIL.Machine.Serval.EngineServer'
working_dir: '/app/src/Machine/src/Serval.Machine.EngineServer'
entrypoint:
- dotnet
- run
Expand All @@ -117,21 +119,23 @@ services:
hostname: machine-job-server
container_name: machine-job-cntr
build:
context: ${MACHINE_TESTING_DIR:-../machine}
dockerfile: ../machine/dockerfile.development
context: .
dockerfile: dockerfile.development
environment:
- ASPNETCORE_ENVIRONMENT=Staging
- ASPNETCORE_ConnectionStrings__Hangfire=${MONGO_CONNECTION_STRING}/${MONGO_CONNECTION_PREFIX}machine_jobs
- ASPNETCORE_ConnectionStrings__Mongo=${MONGO_CONNECTION_STRING}/${MONGO_CONNECTION_PREFIX}machine
- ASPNETCORE_ConnectionStrings__Hangfire=${MONGO_CONNECTION_STRING}/${MONGO_CONNECTION_PREFIX}machine_jobs${MONGO_EXTENSIONS}
- ASPNETCORE_ConnectionStrings__Mongo=${MONGO_CONNECTION_STRING}/${MONGO_CONNECTION_PREFIX}machine${MONGO_EXTENSIONS}
- ASPNETCORE_ConnectionStrings__Serval=http://serval-api:81
- ASPNETCORE_Kestrel__Endpoints__Http__Url=http://*:80
- ASPNETCORE_Kestrel__EndpointDefaults__Protocols=Http2
- ClearML__ApiServer=https://api.sil.hosted.allegro.ai
- ClearML__Queue=lambert_24gb
- ClearML__DockerImage=${MACHINE_PY_IMAGE:-ghcr.io/sillsdev/machine.py:latest}
- ClearML__Project=docker-compose
- "ClearML__AccessKey=${ClearML_AccessKey:?access key needed}"
- "ClearML__SecretKey=${ClearML_SecretKey:?secret key needed}"
- BuildJob__ClearML__0__Queue=lambert_24gb
- BuildJob__ClearML__0__DockerImage=${MACHINE_PY_IMAGE:-ghcr.io/sillsdev/machine.py:latest}
- BuildJob__ClearML__1__Queue=lambert_24gb.cpu_only
- BuildJob__ClearML__1__DockerImage=${MACHINE_PY_CPU_IMAGE:-ghcr.io/sillsdev/machine.py:latest.cpu_only}
- SharedFile__Uri=s3://aqua-ml-data/docker-compose/
- "SharedFile__S3AccessKeyId=${AWS_ACCESS_KEY_ID:?access key needed}"
- "SharedFile__S3SecretAccessKey=${AWS_SECRET_ACCESS_KEY:?secret key needed}"
Expand All @@ -143,11 +147,11 @@ services:
- machine-engine
- serval-api
volumes:
- ${MACHINE_TESTING_DIR:-../machine}:/app:ro
- .:/app:ro
- ~/.nuget/packages:/root/.nuget/packages:ro
- /var/lib/machine:/var/lib/machine
- /var/lib/serval:/var/lib/serval
working_dir: '/app/src/SIL.Machine.Serval.JobServer'
working_dir: '/app/src/Machine/src/Serval.Machine.JobServer'
entrypoint:
- dotnet
- run
Expand Down
4 changes: 1 addition & 3 deletions src/Machine/src/Serval.Machine.Shared/Configuration/IMachineBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,7 @@ public static IMachineBuilder AddMongoDataAccess(this IMachineBuilder builder, s
{
await c.Indexes.CreateOrUpdateAsync(
new CreateIndexModel<TranslationEngine>(
Builders<TranslationEngine>
.IndexKeys.Ascending(e => e.EngineId)
.Ascending("currentBuild._id")
Builders<TranslationEngine>.IndexKeys.Ascending(e => e.EngineId)
)
);
await c.Indexes.CreateOrUpdateAsync(
Expand Down
4 changes: 1 addition & 3 deletions src/Machine/src/Serval.Machine.Shared/Services/MessageOutboxDeliveryService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ public class MessageOutboxDeliveryService(
ILogger<MessageOutboxDeliveryService> logger
) : BackgroundService
{
private static readonly TimeSpan Timeout = TimeSpan.FromSeconds(10);

private readonly IServiceProvider _services = services;
private readonly Dictionary<string, IOutboxMessageHandler> _outboxMessageHandlers =
outboxMessageHandlers.ToDictionary(o => o.OutboxId);
Expand All @@ -25,7 +23,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
using ISubscription<OutboxMessage> subscription = await messages.SubscribeAsync(e => true, stoppingToken);
while (true)
{
await subscription.WaitForChangeAsync(timeout: Timeout, cancellationToken: stoppingToken);
await subscription.WaitForChangeAsync(cancellationToken: stoppingToken);
if (stoppingToken.IsCancellationRequested)
break;
await ProcessMessagesAsync(messages, stoppingToken);
Expand Down
22 changes: 15 additions & 7 deletions src/Serval/src/Serval.Translation/Configuration/IMongoDataAccessConfiguratorExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ this IMongoDataAccessConfigurator configurator
await c.Indexes.CreateOrUpdateAsync(
new CreateIndexModel<Engine>(Builders<Engine>.IndexKeys.Ascending(e => e.Owner))
);
await c.Indexes.CreateOrUpdateAsync(
new CreateIndexModel<Engine>(Builders<Engine>.IndexKeys.Ascending("corpora._id"))
);
}
);
configurator.AddRepository<Build>(
Expand All @@ -33,21 +30,32 @@ await c.Indexes.CreateOrUpdateAsync(
{
await c.Indexes.CreateOrUpdateAsync(
new CreateIndexModel<Pretranslation>(
Builders<Pretranslation>.IndexKeys.Ascending(pt => pt.EngineRef)
Builders<Pretranslation>.IndexKeys.Ascending(pt => pt.ModelRevision)
)
);
await c.Indexes.CreateOrUpdateAsync(
new CreateIndexModel<Pretranslation>(
Builders<Pretranslation>.IndexKeys.Ascending(pt => pt.ModelRevision)
Builders<Pretranslation>.IndexKeys.Ascending(pt => pt.CorpusRef)
)
);
await c.Indexes.CreateOrUpdateAsync(
new CreateIndexModel<Pretranslation>(Builders<Pretranslation>.IndexKeys.Ascending(pt => pt.TextId))
);
await c.Indexes.CreateOrUpdateAsync(
new CreateIndexModel<Pretranslation>(
Builders<Pretranslation>.IndexKeys.Ascending(pt => pt.CorpusRef)
Builders<Pretranslation>
.IndexKeys.Ascending(pt => pt.EngineRef)
.Ascending(pt => pt.ModelRevision)
)
);
await c.Indexes.CreateOrUpdateAsync(
new CreateIndexModel<Pretranslation>(Builders<Pretranslation>.IndexKeys.Ascending(pt => pt.TextId))
new CreateIndexModel<Pretranslation>(
Builders<Pretranslation>
.IndexKeys.Ascending(pt => pt.EngineRef)
.Ascending(pt => pt.CorpusRef)
.Ascending(pt => pt.ModelRevision)
.Ascending(pt => pt.TextId)
)
);
}
);
Expand Down
3 changes: 0 additions & 3 deletions src/Serval/src/Serval.Webhooks/Configuration/IMongoDataAccessConfiguratorExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ public static IMongoDataAccessConfigurator AddWebhooksRepositories(this IMongoDa
"webhooks.hooks",
init: async c =>
{
await c.Indexes.CreateOrUpdateAsync(
new CreateIndexModel<Webhook>(Builders<Webhook>.IndexKeys.Ascending(h => h.Owner))
);
await c.Indexes.CreateOrUpdateAsync(
new CreateIndexModel<Webhook>(Builders<Webhook>.IndexKeys.Ascending(h => h.Events))
);
Expand Down
Loading