Skip to content

Commit 3c6aafa

Browse files
committed
Rename variable
1 parent 352a93b commit 3c6aafa

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

server/src/main/java/org/elasticsearch/action/support/local/TransportLocalClusterStateAction.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ private void waitForClusterUnblock(
108108
);
109109
// We track whether we already notified the listener or started executing the action, to avoid invoking the listener twice.
110110
// Because of that second part, we can not use ActionListener#notifyOnce.
111-
final var notifiedListener = new AtomicBoolean(false);
111+
final var waitComplete = new AtomicBoolean(false);
112112
if (task instanceof CancellableTask cancellableTask) {
113113
cancellableTask.addListener(() -> {
114-
if (notifiedListener.compareAndSet(false, true) == false) {
114+
if (waitComplete.compareAndSet(false, true) == false) {
115115
return;
116116
}
117117
listener.onFailure(new TaskCancelledException("Task was cancelled"));
@@ -121,7 +121,7 @@ private void waitForClusterUnblock(
121121
observer.waitForNextChange(new ClusterStateObserver.Listener() {
122122
@Override
123123
public void onNewClusterState(ClusterState state) {
124-
if (notifiedListener.compareAndSet(false, true) == false) {
124+
if (waitComplete.compareAndSet(false, true) == false) {
125125
return;
126126
}
127127
logger.trace("retrying with cluster state version [{}]", state.version());
@@ -130,15 +130,15 @@ public void onNewClusterState(ClusterState state) {
130130

131131
@Override
132132
public void onClusterServiceClose() {
133-
if (notifiedListener.compareAndSet(false, true) == false) {
133+
if (waitComplete.compareAndSet(false, true) == false) {
134134
return;
135135
}
136136
listener.onFailure(new NodeClosedException(clusterService.localNode()));
137137
}
138138

139139
@Override
140140
public void onTimeout(TimeValue timeout) {
141-
if (notifiedListener.compareAndSet(false, true) == false) {
141+
if (waitComplete.compareAndSet(false, true) == false) {
142142
return;
143143
}
144144
logger.debug(

server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,10 @@ private void retry(long currentStateVersion, final Throwable failure, final Pred
307307
}
308308
// We track whether we already notified the listener or started executing the action, to avoid invoking the listener twice.
309309
// Because of that second part, we can not use ActionListener#notifyOnce.
310-
final var notifiedListener = new AtomicBoolean(false);
310+
final var waitComplete = new AtomicBoolean(false);
311311
if (task instanceof CancellableTask cancellableTask) {
312312
cancellableTask.addListener(() -> {
313-
if (notifiedListener.compareAndSet(false, true) == false) {
313+
if (waitComplete.compareAndSet(false, true) == false) {
314314
return;
315315
}
316316
listener.onFailure(new TaskCancelledException("Task was cancelled"));
@@ -320,7 +320,7 @@ private void retry(long currentStateVersion, final Throwable failure, final Pred
320320
observer.waitForNextChange(new ClusterStateObserver.Listener() {
321321
@Override
322322
public void onNewClusterState(ClusterState state) {
323-
if (notifiedListener.compareAndSet(false, true) == false) {
323+
if (waitComplete.compareAndSet(false, true) == false) {
324324
return;
325325
}
326326
logger.trace("retrying with cluster state version [{}]", state.version());
@@ -329,15 +329,15 @@ public void onNewClusterState(ClusterState state) {
329329

330330
@Override
331331
public void onClusterServiceClose() {
332-
if (notifiedListener.compareAndSet(false, true) == false) {
332+
if (waitComplete.compareAndSet(false, true) == false) {
333333
return;
334334
}
335335
listener.onFailure(new NodeClosedException(clusterService.localNode()));
336336
}
337337

338338
@Override
339339
public void onTimeout(TimeValue timeout) {
340-
if (notifiedListener.compareAndSet(false, true) == false) {
340+
if (waitComplete.compareAndSet(false, true) == false) {
341341
return;
342342
}
343343
logger.debug(() -> format("timed out while retrying [%s] after failure (timeout [%s])", actionName, timeout), failure);

0 commit comments

Comments
 (0)