feedback

Author: ywelsch

server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java

@@ -390,11 +390,9 @@ protected void runTask(UpdateTask task) {
             newClusterState = task.apply(previousClusterState);
         } catch (Exception e) {
             TimeValue executionTime = TimeValue.timeValueMillis(Math.max(0, TimeValue.nsecToMSec(currentTimeInNanos() - startTimeNS)));
-            if (logger.isTraceEnabled()) {
-                logger.trace(() -> new ParameterizedMessage(
-                        "failed to execute cluster state applier in [{}], state:\nversion [{}], source [{}]\n{}",
-                        executionTime, previousClusterState.version(), task.source, previousClusterState), e);
-            }
+            logger.trace(() -> new ParameterizedMessage(
+                "failed to execute cluster state applier in [{}], state:\nversion [{}], source [{}]\n{}",
+                executionTime, previousClusterState.version(), task.source, previousClusterState), e);
             warnAboutSlowTaskIfNeeded(executionTime, task.source);
             task.listener.onFailure(task.source, e);
             return;
@@ -407,8 +405,9 @@ protected void runTask(UpdateTask task) {
             task.listener.onSuccess(task.source);
         } else {
             if (logger.isTraceEnabled()) {
-                logger.trace("cluster state updated, source [{}]\n{}", task.source, newClusterState);
-            } else if (logger.isDebugEnabled()) {
+                logger.debug("cluster state updated, version [{}], source [{}]\n{}", newClusterState.version(), task.source,
+                    newClusterState);
+            } else {
                 logger.debug("cluster state updated, version [{}], source [{}]", newClusterState.version(), task.source);
             }
             try {
@@ -422,11 +421,11 @@ protected void runTask(UpdateTask task) {
             } catch (Exception e) {
                 TimeValue executionTime = TimeValue.timeValueMillis(Math.max(0, TimeValue.nsecToMSec(currentTimeInNanos() - startTimeNS)));
                 if (logger.isTraceEnabled()) {
-                    logger.warn(() -> new ParameterizedMessage(
+                    logger.warn(new ParameterizedMessage(
                             "failed to apply updated cluster state in [{}]:\nversion [{}], uuid [{}], source [{}]\n{}",
                             executionTime, newClusterState.version(), newClusterState.stateUUID(), task.source, newClusterState), e);
                 } else {
-                    logger.warn(() -> new ParameterizedMessage(
+                    logger.warn(new ParameterizedMessage(
                             "failed to apply updated cluster state in [{}]:\nversion [{}], uuid [{}], source [{}]",
                             executionTime, newClusterState.version(), newClusterState.stateUUID(), task.source), e);
                 }

server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java

@@ -1875,7 +1875,7 @@ static class DisruptableClusterApplierService extends ClusterApplierService {
                             + oldClusterState.version() + " to stale version " + newClusterState.version();
                         break;
                     case FAIL:
-                        throw new ElasticsearchException("cluster state application failed");
+                        throw new ElasticsearchException("simulated cluster state applier failure");
                 }
             });
         }