Skip to content

Commit e59ab20

Browse files
committed
fixes
1 parent 508fec1 commit e59ab20

File tree

7 files changed

+12
-11
lines changed

7 files changed

+12
-11
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ public void stop() throws OperatorException {
133133
log.info(
134134
"Operator SDK {} is shutting down...", configurationService.getVersion().getSdkVersion());
135135
controllerManager.stop();
136-
ExecutorServiceManager.stop();
136+
// todo
137+
// ExecutorServiceManager.stop();
137138
leaderElectionManager.stop();
138139
if (configurationService.closeClientOnStop()) {
139140
kubernetesClient.close();

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@ public void run() {
424424

425425
@Override
426426
public String toString() {
427-
return controllerName() + " -> " + executionScope;
427+
return controllerName() + " -> "
428+
+ (executionScope.getResource() != null ? executionScope : resourceID);
428429
}
429430
}
430431

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSourceManager.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ public synchronized void stop() {
9797
eventSources.additionalNamedEventSources(),
9898
this::stopEventSource,
9999
getThreadNamer("stop"));
100-
eventSources.clear();
101100
}
102101

103102
@SuppressWarnings("rawtypes")

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ public class InformerManager<T extends HasMetadata, C extends ResourceConfigurat
4747
private final Map<String, Function<T, List<String>>> indexers = new HashMap<>();
4848

4949
public InformerManager(MixedOperation<T, KubernetesResourceList<T>, Resource<T>> client,
50-
C configuration,
51-
ResourceEventHandler<T> eventHandler) {
50+
C configuration,
51+
ResourceEventHandler<T> eventHandler) {
5252
this.client = client;
5353
this.configuration = configuration;
5454
this.eventHandler = eventHandler;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected ManagedInformerEventSource(
4444
MixedOperation<R, KubernetesResourceList<R>, Resource<R>> client, C configuration) {
4545
super(configuration.getResourceClass());
4646
temporaryResourceCache = new TemporaryResourceCache<>(this);
47-
cache = new InformerManager<>(client,configuration,this);
47+
cache = new InformerManager<>(client, configuration, this);
4848
this.configuration = configuration;
4949
}
5050

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/timer/TimerEventSource.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class TimerEventSource<R extends HasMetadata>
2020
implements ResourceEventAware<R> {
2121
private static final Logger log = LoggerFactory.getLogger(TimerEventSource.class);
2222

23-
private final Timer timer = new Timer(true);
23+
private Timer timer;
2424
private final AtomicBoolean running = new AtomicBoolean();
2525
private final Map<ResourceID, EventProducerTimeTask> onceTasks = new ConcurrentHashMap<>();
2626

@@ -55,6 +55,7 @@ public void cancelOnceSchedule(ResourceID customResourceUid) {
5555

5656
@Override
5757
public void start() {
58+
timer = new Timer(true);
5859
running.set(true);
5960
}
6061

operator-framework/src/test/java/io/javaoperatorsdk/operator/OperatorRestartIT.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package io.javaoperatorsdk.operator;
22

3-
import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
4-
import io.javaoperatorsdk.operator.sample.informerrelatedbehavior.InformerRelatedBehaviorTestCustomResource;
53
import org.junit.jupiter.api.Test;
64

75
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
86
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
7+
import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
98
import io.javaoperatorsdk.operator.sample.restart.RestartTestCustomResource;
109
import io.javaoperatorsdk.operator.sample.restart.RestartTestReconciler;
1110

@@ -18,9 +17,9 @@ class OperatorRestartIT {
1817
void operatorCanBeRestarted() {
1918
try (var client = new KubernetesClientBuilder().build()) {
2019
LocallyRunOperatorExtension.applyCrd(RestartTestCustomResource.class,
21-
client);
20+
client);
2221
// todo check if this is good enough for Quarkus dev mode
23-
Operator operator = new Operator(o->o.withCloseClientOnStop(false));
22+
Operator operator = new Operator(o -> o.withCloseClientOnStop(false));
2423
var reconciler = new RestartTestReconciler();
2524
operator.register(reconciler);
2625
operator.start();

0 commit comments

Comments
 (0)