Skip to content

Grab the request lock when persisting request/deploy history #1863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssalinas merged 2 commits into from
Nov 6, 2018
Merged

Grab the request lock when persisting request/deploy history #1863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f6a3a2
Grab the request lock when persisting request/deploy history
ssalinas Oct 3, 2018
0abbb47
increment after
ssalinas Oct 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions ...src/main/java/com/hubspot/singularity/data/history/SingularityDeployHistoryPersister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import com.hubspot.singularity.SingularityRequestDeployState;
import com.hubspot.singularity.config.SingularityConfiguration;
import com.hubspot.singularity.data.DeployManager;
import com.hubspot.singularity.mesos.SingularitySchedulerLock;

@Singleton
public class SingularityDeployHistoryPersister extends SingularityHistoryPersister<SingularityDeployHistory> {
Expand All @@ -30,16 +31,19 @@ public class SingularityDeployHistoryPersister extends SingularityHistoryPersist

private final DeployManager deployManager;
private final HistoryManager historyManager;
private final SingularitySchedulerLock lock;

@Inject
public SingularityDeployHistoryPersister(SingularityConfiguration configuration,
DeployManager deployManager,
HistoryManager historyManager,
SingularitySchedulerLock lock,
@Named(SingularityHistoryModule.PERSISTER_LOCK) ReentrantLock persisterLock) {
super(configuration, persisterLock);

this.deployManager = deployManager;
this.historyManager = historyManager;
this.lock = lock;
}

@Override
Expand All @@ -60,19 +64,21 @@ public void runActionOnPoll() {
int numTransferred = 0;

for (SingularityDeployKey deployKey : allDeployIds) {
SingularityRequestDeployState deployState = byRequestId.get(deployKey.getRequestId());
lock.runWithRequestLock(() -> {
SingularityRequestDeployState deployState = byRequestId.get(deployKey.getRequestId());

if (!shouldTransferDeploy(deployState, deployKey)) {
continue;
}
if (!shouldTransferDeploy(deployState, deployKey)) {
return;
}

Optional<SingularityDeployHistory> deployHistory = deployManager.getDeployHistory(deployKey.getRequestId(), deployKey.getDeployId(), true);
Optional<SingularityDeployHistory> deployHistory = deployManager.getDeployHistory(deployKey.getRequestId(), deployKey.getDeployId(), true);

if (deployHistory.isPresent()) {
deployHistoryByRequestId.put(deployKey.getRequestId(), deployHistory.get());
} else {
LOG.info("Deploy history for key {} not found", deployKey);
}
if (deployHistory.isPresent()) {
deployHistoryByRequestId.put(deployKey.getRequestId(), deployHistory.get());
} else {
LOG.info("Deploy history for key {} not found", deployKey);
}
}, deployKey.getRequestId(), "deploy history persister");
}

for (Collection<SingularityDeployHistory> deployHistoryForRequest : deployHistoryByRequestId.asMap().values()) {
Expand Down
17 changes: 12 additions & 5 deletions ...rc/main/java/com/hubspot/singularity/data/history/SingularityRequestHistoryPersister.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.List;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;

import javax.inject.Singleton;
Expand All @@ -23,6 +24,7 @@
import com.hubspot.singularity.config.SingularityConfiguration;
import com.hubspot.singularity.data.RequestManager;
import com.hubspot.singularity.data.history.SingularityRequestHistoryPersister.SingularityRequestHistoryParent;
import com.hubspot.singularity.mesos.SingularitySchedulerLock;

@Singleton
public class SingularityRequestHistoryPersister extends SingularityHistoryPersister<SingularityRequestHistoryParent> {
Expand All @@ -31,16 +33,19 @@ public class SingularityRequestHistoryPersister extends SingularityHistoryPersis

private final RequestManager requestManager;
private final HistoryManager historyManager;
private final SingularitySchedulerLock lock;

@Inject
public SingularityRequestHistoryPersister(SingularityConfiguration configuration,
RequestManager requestManager,
HistoryManager historyManager,
SingularitySchedulerLock lock,
@Named(SingularityHistoryModule.PERSISTER_LOCK) ReentrantLock persisterLock) {
super(configuration, persisterLock);

this.requestManager = requestManager;
this.historyManager = historyManager;
this.lock = lock;
}

public static class SingularityRequestHistoryParent implements SingularityHistoryItem, Comparable<SingularityRequestHistoryParent> {
Expand Down Expand Up @@ -114,19 +119,21 @@ public void runActionOnPoll() {

final List<SingularityRequestHistoryParent> requestHistoryParents = new ArrayList();

int numHistoryTransferred = 0;
AtomicInteger numHistoryTransferred = new AtomicInteger();

for (String requestId : requestManager.getRequestIdsWithHistory()) {
requestHistoryParents.add(new SingularityRequestHistoryParent(requestManager.getRequestHistory(requestId), requestId));
}

Collections.sort(requestHistoryParents, Collections.reverseOrder()); // createdAt descending

int i = 0;
AtomicInteger i = new AtomicInteger();
for (SingularityRequestHistoryParent requestHistoryParent : requestHistoryParents) {
if (moveToHistoryOrCheckForPurge(requestHistoryParent, i++)) {
numHistoryTransferred += requestHistoryParent.history.size();
}
lock.runWithRequestLock(() -> {
if (moveToHistoryOrCheckForPurge(requestHistoryParent, i.getAndIncrement())) {
numHistoryTransferred.getAndAdd(requestHistoryParent.history.size());
}
}, requestHistoryParent.requestId, "request history purger");
}

LOG.info("Transferred {} history updates for {} requests in {}", numHistoryTransferred, requestHistoryParents.size(), JavaUtils.duration(start));
Expand Down