Skip to content

Commit 2162c44

Browse files
authored
fix(Pulsar): Set memory limits (#1420)
1 parent e37b279 commit 2162c44

File tree

3 files changed

+27
-5
lines changed

3 files changed

+27
-5
lines changed

src/Testcontainers.Pulsar/PulsarBuilder.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,20 @@ public override PulsarContainer Build()
6868
{
6969
Validate();
7070

71-
var waitStrategy = Wait.ForUnixContainer().AddCustomWaitStrategy(new WaitUntil(DockerResourceConfiguration.AuthenticationEnabled.GetValueOrDefault()));
71+
var waitStrategy = Wait.ForUnixContainer();
72+
73+
if (DockerResourceConfiguration.AuthenticationEnabled.GetValueOrDefault())
74+
{
75+
waitStrategy = waitStrategy.UntilFileExists(SecretKeyFilePath, FileSystem.Container);
76+
}
7277

7378
if (DockerResourceConfiguration.FunctionsWorkerEnabled.GetValueOrDefault())
7479
{
7580
waitStrategy = waitStrategy.UntilMessageIsLogged("Function worker service started");
7681
}
7782

83+
waitStrategy = waitStrategy.AddCustomWaitStrategy(new WaitUntil(DockerResourceConfiguration.AuthenticationEnabled.GetValueOrDefault()));
84+
7885
var pulsarBuilder = DockerResourceConfiguration.WaitStrategies.Count() > 1 ? this : WithWaitStrategy(waitStrategy);
7986
return new PulsarContainer(pulsarBuilder.DockerResourceConfiguration);
8087
}

tests/Testcontainers.Pulsar.Tests/PulsarContainerTest.cs

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ namespace Testcontainers.Pulsar;
22

33
public abstract class PulsarContainerTest : IAsyncLifetime
44
{
5+
private static readonly IReadOnlyDictionary<string, string> MemorySettings = new Dictionary<string, string> { { "PULSAR_MEM", "-Xms256m -Xmx512m" } };
6+
57
private readonly PulsarContainer _pulsarContainer;
68

79
private readonly bool _authenticationEnabled;
@@ -69,7 +71,9 @@ public async Task ConsumerReceivesSendMessage()
6971
public sealed class PulsarDefaultConfiguration : PulsarContainerTest
7072
{
7173
public PulsarDefaultConfiguration()
72-
: base(new PulsarBuilder().Build(), false)
74+
: base(new PulsarBuilder()
75+
.WithEnvironment(MemorySettings)
76+
.Build(), false)
7377
{
7478
}
7579
}
@@ -79,7 +83,10 @@ public PulsarDefaultConfiguration()
7983
public sealed class PulsarAuthConfiguration : PulsarContainerTest
8084
{
8185
public PulsarAuthConfiguration()
82-
: base(new PulsarBuilder().WithAuthentication().Build(), true)
86+
: base(new PulsarBuilder()
87+
.WithAuthentication()
88+
.WithEnvironment(MemorySettings)
89+
.Build(), true)
8390
{
8491
}
8592
}
@@ -88,7 +95,10 @@ public PulsarAuthConfiguration()
8895
public sealed class PulsarV4Configuration : PulsarContainerTest
8996
{
9097
public PulsarV4Configuration()
91-
: base(new PulsarBuilder().WithImage("apachepulsar/pulsar:4.0.2").Build(), false)
98+
: base(new PulsarBuilder()
99+
.WithImage("apachepulsar/pulsar:4.0.2")
100+
.WithEnvironment(MemorySettings)
101+
.Build(), false)
92102
{
93103
}
94104
}
@@ -97,7 +107,11 @@ public PulsarV4Configuration()
97107
public sealed class PulsarV4AuthConfiguration : PulsarContainerTest
98108
{
99109
public PulsarV4AuthConfiguration()
100-
: base(new PulsarBuilder().WithImage("apachepulsar/pulsar:4.0.2").WithAuthentication().Build(), true)
110+
: base(new PulsarBuilder()
111+
.WithImage("apachepulsar/pulsar:4.0.2")
112+
.WithAuthentication()
113+
.WithEnvironment(MemorySettings)
114+
.Build(), true)
101115
{
102116
}
103117
}

tests/Testcontainers.Pulsar.Tests/Usings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
global using System;
2+
global using System.Collections.Generic;
23
global using System.Text;
34
global using System.Threading;
45
global using System.Threading.Tasks;

0 commit comments

Comments
 (0)