MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid NPE by using scheduledFuture as the Gauge state object

This commit is contained in:
Chris Eager 2021-06-28 16:54:25 -05:00 committed by Chris Eager
parent abaed821ec
commit a85afe827d
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWork.java
View File

@ -14,7 +14,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean; import javax.annotation.Nullable;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.whispersystems.textsecuregcm.util.Util; import org.whispersystems.textsecuregcm.util.Util;
@ -31,8 +31,7 @@ public abstract class ManagedPeriodicWork implements Managed {
private final String workerId; private final String workerId;
private final ScheduledExecutorService executorService; private final ScheduledExecutorService executorService;
private final AtomicBoolean started = new AtomicBoolean(false); @Nullable
private ScheduledFuture<?> scheduledFuture; private ScheduledFuture<?> scheduledFuture;
public ManagedPeriodicWork(final ManagedPeriodicWorkLock lock, final Duration workerTtl, final Duration runInterval, final ScheduledExecutorService scheduledExecutorService) { public ManagedPeriodicWork(final ManagedPeriodicWorkLock lock, final Duration workerTtl, final Duration runInterval, final ScheduledExecutorService scheduledExecutorService) {
@ -41,20 +40,14 @@ public abstract class ManagedPeriodicWork implements Managed {
this.runInterval = runInterval; this.runInterval = runInterval;
this.workerId = UUID.randomUUID().toString(); this.workerId = UUID.randomUUID().toString();
this.executorService = scheduledExecutorService; this.executorService = scheduledExecutorService;
Metrics.gauge(name(getClass(), FUTURE_DONE_GAUGE_NAME), this, ManagedPeriodicWork::isFutureDone);
} }
abstract protected void doPeriodicWork() throws Exception; abstract protected void doPeriodicWork() throws Exception;
int isFutureDone() {
return scheduledFuture.isDone() ? 1 : 0;
}
@Override @Override
public synchronized void start() throws Exception { public synchronized void start() throws Exception {
if (started.getAndSet(true)) { if (scheduledFuture != null) {
return; return;
} }
@ -68,6 +61,8 @@ public abstract class ManagedPeriodicWork implements Managed {
Util.sleep(10_000); Util.sleep(10_000);
} }
}, 0, runInterval.getSeconds(), TimeUnit.SECONDS); }, 0, runInterval.getSeconds(), TimeUnit.SECONDS);
Metrics.gauge(name(getClass(), FUTURE_DONE_GAUGE_NAME), scheduledFuture, future -> future.isDone() ? 1 : 0);
} }
@Override @Override