Working tests

Author: jonathan-buttner

x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/CCMServiceIT.java

@@ -169,8 +169,8 @@ private void forceClusterUpdate() {
 
     public void testDisableCCM_RemovesAuthorizationTask() throws Exception {
         disableCCM();
-        waitForNoTask(AUTH_TASK_ACTION, admin());
         assertCCMDisabled();
+        waitForNoTask(AUTH_TASK_ACTION, admin());
 
         var listener = new TestPlainActionFuture<Void>();
         ccmService.get().storeConfiguration(new CCMModel(new SecureString("secret".toCharArray())), listener);
@@ -183,8 +183,8 @@ public void testDisableCCM_RemovesAuthorizationTask() throws Exception {
         waitForAuthorizationToComplete(authorizationTaskExecutor);
 
         disableCCM();
-        waitForNoTask(AUTH_TASK_ACTION, admin());
         assertCCMDisabled();
+        waitForNoTask(AUTH_TASK_ACTION, admin());
     }
 
     private void assertCCMDisabled() {

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferencePlugin.java

@@ -462,7 +462,7 @@ private CCMRelatedComponents createCCMDependentComponents(
     ) {
         var ccmEnablementService = new CCMEnablementService(services.clusterService(), services.featureService(), ccmFeature);
         var ccmPersistentStorageService = new CCMPersistentStorageService(services.client());
-        var ccmService = new CCMService(ccmPersistentStorageService, ccmEnablementService, services.projectResolver());
+        var ccmService = new CCMService(ccmPersistentStorageService, ccmEnablementService, services.projectResolver(), services.client());
         var ccmAuthApplierFactory = new CCMAuthenticationApplierFactory(ccmFeature, ccmService);
 
         var authorizationHandler = new ElasticInferenceServiceAuthorizationRequestHandler(

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/ccm/CCMService.java

@@ -52,7 +52,7 @@ public void storeConfiguration(CCMModel model, ActionListener<Void> listener) {
                     logger.debug("Successfully set CCM enabled in enablement service");
                     enablementListener.onResponse(null);
                 }, e -> {
-                    logger.atDebug().withThrowable(e).log("Failed to enable CCM in enablement service");
+                    logger.atWarn().withThrowable(e).log("Failed to enable CCM in enablement service");
                     enablementListener.onFailure(e);
                 }))
             )
@@ -64,8 +64,10 @@ public void storeConfiguration(CCMModel model, ActionListener<Void> listener) {
                         logger.debug("Successfully enabled authorization task executor");
                         enableAuthExecutorListener.onResponse(null);
                     }, e -> {
-                        logger.atDebug().withThrowable(e).log("Failed to enable authorization task executor");
-                        enableAuthExecutorListener.onFailure(e);
+                        logger.atWarn().withThrowable(e).log("Failed to request start of authorization task");
+                        // even if requesting start of the authorization task fails, we still consider CCM enabled because
+                        // the cluster state listener will eventually start the task if it is missing
+                        enableAuthExecutorListener.onResponse(null);
                     })
                 )
             )
@@ -88,7 +90,7 @@ public void disableCCM(ActionListener<Void> listener) {
                     logger.debug("Successfully set CCM disabled in enablement service");
                     disableAuthExecutorListener.onResponse(null);
                 }, e -> {
-                    logger.atDebug().withThrowable(e).log("Failed to disable CCM in enablement service");
+                    logger.atWarn().withThrowable(e).log("Failed to disable CCM in enablement service");
                     disableAuthExecutorListener.onFailure(e);
                 })
             )
@@ -102,8 +104,10 @@ public void disableCCM(ActionListener<Void> listener) {
                         logger.debug("Successfully disabled authorization task executor");
                         disableAuthExecutorListener.onResponse(null);
                     }, e -> {
-                        logger.atDebug().withThrowable(e).log("Failed to disable authorization task executor");
-                        disableAuthExecutorListener.onFailure(e);
+                        logger.atWarn().withThrowable(e).log("Failed to request stop of authorization task");
+                        // even if stopping the authorization task fails, we still consider CCM disabled because the tasks themselves
+                        // should eventually stop after they check if ccm is enabled
+                        disableAuthExecutorListener.onResponse(null);
                     })
                 )
             )