Skip to content
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

Jump to bottom

Remove unneeded call to unsafeProcessStatusUpdate, fix tasksPerOfferHost check #1719

Merged
merged 1 commit into from Feb 16, 2018
Merged

Remove unneeded call to unsafeProcessStatusUpdate, fix tasksPerOfferHost check #1719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...tyService/src/main/java/com/hubspot/singularity/mesos/SingularityMesosOfferScheduler.java
View file
Open in desktop
Expand Up @@ -193,17 +193,18 @@ public Collection<SingularityOfferHolder> checkOffers(final Collection<Offer> of

LOG.trace("Found slave usages {}", currentSlaveUsagesBySlaveId);

Map<String, Integer> tasksPerOfferHost = new ConcurrentHashMap<>();

for (SingularityTaskRequestHolder taskRequestHolder : sortedTaskRequestHolders) {
lock.runWithRequestLock(() -> {
Map<String, Integer> tasksPerOffer = new ConcurrentHashMap<>();
Map<String, Double> scorePerOffer = new ConcurrentHashMap<>();
List<SingularityTaskId> activeTaskIdsForRequest = leaderCache.getActiveTaskIdsForRequest(taskRequestHolder.getTaskRequest().getRequest().getId());

List<CompletableFuture<Void>> scoringFutures = new ArrayList<>();
for (SingularityOfferHolder offerHolder : offerHolders.values()) {
if (!isOfferFull(offerHolder)) {
scoringFutures.add(offerScoringSemaphore.call(() -> CompletableFuture.runAsync(() -> {
double score = calculateScore(offerHolder, currentSlaveUsagesBySlaveId, tasksPerOffer, taskRequestHolder, activeTaskIdsForRequest);
double score = calculateScore(offerHolder, currentSlaveUsagesBySlaveId, tasksPerOfferHost, taskRequestHolder, activeTaskIdsForRequest);
if (score != 0) {
scorePerOffer.put(offerHolder.getSlaveId(), score);
}
Expand All @@ -216,7 +217,7 @@ public Collection<SingularityOfferHolder> checkOffers(final Collection<Offer> of
if (!scorePerOffer.isEmpty()) {
SingularityOfferHolder bestOffer = offerHolders.get(Collections.max(scorePerOffer.entrySet(), Map.Entry.comparingByValue()).getKey());
LOG.info("Best offer {}/1 is on {}", scorePerOffer.get(bestOffer.getSlaveId()), bestOffer.getSanitizedHost());
SingularityMesosTaskHolder taskHolder = acceptTask(bestOffer, tasksPerOffer, taskRequestHolder);
SingularityMesosTaskHolder taskHolder = acceptTask(bestOffer, tasksPerOfferHost, taskRequestHolder);
tasksScheduled.getAndIncrement();
bestOffer.addMatchedTask(taskHolder);
}
Expand Down
4 changes: 2 additions & 2 deletions ...vice/src/main/java/com/hubspot/singularity/mesos/SingularityMesosStatusUpdateHandler.java
View file
Open in desktop
Expand Up @@ -269,8 +269,8 @@ public CompletableFuture<Boolean> processStatusUpdateAsync(Protos.TaskStatus sta
schedulerLock.runWithRequestLock(
() -> unsafeProcessStatusUpdate(status, maybeTaskId.get()),
maybeTaskId.get().getRequestId(),
getClass().getSimpleName());
unsafeProcessStatusUpdate(status, maybeTaskId.get());
getClass().getSimpleName()
);
return true;
}, statusUpdatesExecutor)
);
Expand Down
7 changes: 3 additions & 4 deletions SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityScheduler.java
View file
Open in desktop
Expand Up @@ -236,11 +236,10 @@ public void drainPendingQueue() {
AtomicInteger heldForScheduledActiveTask = new AtomicInteger(0);
AtomicInteger obsoleteRequests = new AtomicInteger(0);

deployKeyToPendingRequests.entrySet().parallelStream()
.forEach((deployKeyToPendingRequest) -> {
deployKeyToPendingRequests.forEach((deployKey, pendingRequestsForDeployKey) -> {
lock.runWithRequestLock(
() -> handlePendingRequestsForDeployKey(obsoleteRequests, heldForScheduledActiveTask, totalNewScheduledTasks, deployKeyToPendingRequest.getKey(), deployKeyToPendingRequest.getValue()),
deployKeyToPendingRequest.getKey().getRequestId(),
() -> handlePendingRequestsForDeployKey(obsoleteRequests, heldForScheduledActiveTask, totalNewScheduledTasks, deployKey, pendingRequestsForDeployKey),
deployKey.getRequestId(),
String.format("%s#%s", getClass().getSimpleName(), "drainPendingQueue"));
});

Expand Down