1- // Copyright (c) 2022, 2023 , Oracle and/or its affiliates.
1+ // Copyright (c) 2022, 2024 , Oracle and/or its affiliates.
22// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
44package oracle .kubernetes .operator ;
2424import java .util .concurrent .ThreadFactory ;
2525import java .util .concurrent .TimeUnit ;
2626import java .util .concurrent .atomic .AtomicReference ;
27- import javax .annotation .Nonnull ;
2827
2928import oracle .kubernetes .common .logging .MessageKeys ;
30- import oracle .kubernetes .operator .calls .UnrecoverableCallException ;
31- import oracle .kubernetes .operator .helpers .ClientPool ;
3229import oracle .kubernetes .operator .helpers .HelmAccess ;
3330import oracle .kubernetes .operator .http .BaseServer ;
3431import oracle .kubernetes .operator .http .metrics .MetricsServer ;
3835import oracle .kubernetes .operator .logging .LoggingFactory ;
3936import oracle .kubernetes .operator .tuning .TuningParameters ;
4037import oracle .kubernetes .operator .utils .PathSupport ;
41- import oracle .kubernetes .operator .work .Component ;
42- import oracle .kubernetes .operator .work .Container ;
43- import oracle .kubernetes .operator .work .ContainerResolver ;
44- import oracle .kubernetes .operator .work .Engine ;
4538import oracle .kubernetes .operator .work .Fiber .CompletionCallback ;
4639import oracle .kubernetes .operator .work .Packet ;
4740import oracle .kubernetes .operator .work .Step ;
41+ import oracle .kubernetes .operator .work .VirtualScheduledExecutorService ;
4842import oracle .kubernetes .utils .SystemClock ;
4943
5044/** An abstract base main class for the operator and the webhook. */
@@ -56,10 +50,8 @@ public abstract class BaseMain {
5650 static final String GIT_COMMIT_KEY = "git.commit.id.abbrev" ;
5751 static final String GIT_BUILD_TIME_KEY = "git.build.time" ;
5852
59- static final Container container = new Container ();
60- static final ThreadFactory threadFactory = new WrappedThreadFactory ();
61- static ScheduledExecutorService wrappedExecutorService =
62- Engine .wrappedExecutorService (container ); // non-final to allow change in unit tests
53+ static final ThreadFactory threadFactory = Thread .ofVirtual ().factory ();
54+ static final ScheduledExecutorService executor = new VirtualScheduledExecutorService ();
6355 static final AtomicReference <OffsetDateTime > lastFullRecheck =
6456 new AtomicReference <>(SystemClock .now ());
6557 static final Semaphore shutdownSignal = new Semaphore (0 );
@@ -78,8 +70,6 @@ public abstract class BaseMain {
7870 PrintStream nullOut = new PrintStream (output );
7971 System .setErr (nullOut );
8072
81- ClientPool .initialize (threadFactory );
82-
8373 // Simplify debugging the operator by allowing the setting of the operator
8474 // top-level directory using either an env variable or a property. In the normal,
8575 // container-based use case these values won't be set and the operator will with the
@@ -96,7 +86,7 @@ public abstract class BaseMain {
9686 }
9787 probesHome = new File (probesHomeLoc );
9888
99- TuningParameters .initializeInstance (wrappedExecutorService , new File (deploymentHome , "config" ));
89+ TuningParameters .initializeInstance (executor , new File (deploymentHome , "config" ));
10090 } catch (IOException e ) {
10191 LOGGER .warning (MessageKeys .EXCEPTION , e );
10292 throw new RuntimeException (e );
@@ -165,19 +155,18 @@ void markReadyAndStartLivenessThread() {
165155
166156 logStartingLivenessMessage ();
167157 // every five seconds we need to update the last modified time on the liveness file
168- wrappedExecutorService .scheduleWithFixedDelay (
169- new DeploymentLiveness (delegate ), 5 , 5 , TimeUnit .SECONDS );
158+ delegate .scheduleWithFixedDelay (new DeploymentLiveness (delegate ), 5 , 5 , TimeUnit .SECONDS );
170159 } catch (IOException io ) {
171160 LOGGER .severe (MessageKeys .EXCEPTION , io );
172161 }
173162 }
174163
175- void startRestServer (Container container )
164+ void startRestServer ()
176165 throws UnrecoverableKeyException , CertificateException , IOException , NoSuchAlgorithmException ,
177166 KeyStoreException , InvalidKeySpecException , KeyManagementException {
178167 BaseRestServer value = createRestServer ();
179168 restServer .set (value );
180- value .start (container );
169+ value .start ();
181170 }
182171
183172 abstract BaseRestServer createRestServer ();
@@ -191,18 +180,17 @@ void stopRestServer() {
191180 Optional .ofNullable (restServer .getAndSet (null )).ifPresent (BaseServer ::stop );
192181 }
193182
194- @ SuppressWarnings ("SameParameterValue" )
195- void startMetricsServer (Container container ) throws UnrecoverableKeyException , CertificateException , IOException ,
183+ void startMetricsServer () throws UnrecoverableKeyException , CertificateException , IOException ,
196184 NoSuchAlgorithmException , KeyStoreException , InvalidKeySpecException , KeyManagementException {
197- startMetricsServer (container , delegate .getMetricsPort ());
185+ startMetricsServer (delegate .getMetricsPort ());
198186 }
199187
200188 // for test
201- void startMetricsServer (Container container , int port ) throws UnrecoverableKeyException , CertificateException ,
189+ void startMetricsServer (int port ) throws UnrecoverableKeyException , CertificateException ,
202190 IOException , NoSuchAlgorithmException , KeyStoreException , InvalidKeySpecException , KeyManagementException {
203191 BaseServer value = new MetricsServer (port );
204192 metricsServer .set (value );
205- value .start (container );
193+ value .start ();
206194 }
207195
208196 // for test
@@ -253,7 +241,7 @@ void waitForDeath() {
253241 }
254242
255243 void scheduleCheckForShutdownMarker () {
256- wrappedExecutorService .scheduleWithFixedDelay (
244+ delegate .scheduleWithFixedDelay (
257245 () -> {
258246 File marker = new File (delegate .getDeploymentHome (), CoreDelegate .SHUTDOWN_MARKER_NAME );
259247 if (isFileExists (marker )) {
@@ -268,25 +256,10 @@ private static boolean isFileExists(File file) {
268256
269257 static Packet createPacketWithLoggingContext (String ns ) {
270258 Packet packet = new Packet ();
271- packet .getComponents ().put (
272- LoggingContext .LOGGING_CONTEXT_KEY ,
273- Component .createFor (new LoggingContext ().namespace (ns )));
259+ packet .put (LoggingContext .LOGGING_CONTEXT_KEY , new LoggingContext ().namespace (ns ));
274260 return packet ;
275261 }
276262
277- private static class WrappedThreadFactory implements ThreadFactory {
278- private final ThreadFactory delegate = Thread .ofVirtual ().factory ();
279-
280- @ Override
281- public Thread newThread (@ Nonnull Runnable r ) {
282- return delegate .newThread (
283- () -> {
284- ContainerResolver .getDefault ().enterContainer (container );
285- r .run ();
286- });
287- }
288- }
289-
290263 static class NullCompletionCallback implements CompletionCallback {
291264 private final Runnable completionAction ;
292265
@@ -303,11 +276,7 @@ public void onCompletion(Packet packet) {
303276
304277 @ Override
305278 public void onThrowable (Packet packet , Throwable throwable ) {
306- if (throwable instanceof UnrecoverableCallException uce ) {
307- uce .log ();
308- } else {
309- LOGGER .severe (MessageKeys .EXCEPTION , throwable );
310- }
279+ LOGGER .severe (MessageKeys .EXCEPTION , throwable );
311280 }
312281 }
313282}
0 commit comments