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.

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

[CELEBORN-1589] Ensure master is leader for some POST request APIs #2730

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1364,7 +1364,7 @@ private[celeborn] class Master(
}
}

private def isMasterActive: Int = {
def isMasterActive: Int = {
akpatnam25 marked this conversation as resolved.
Show resolved Hide resolved
// use int rather than bool for better monitoring on dashboard
val isActive =
if (conf.haEnabled) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,15 @@ class WorkerResource extends ApiRequestContext {
@POST
@Path("/exclude")
def excludeWorker(request: ExcludeWorkerRequest): HandleResponse = {
val (success, msg) = httpService.exclude(
request.getAdd.asScala.map(ApiUtils.toWorkerInfo).toSeq,
request.getRemove.asScala.map(ApiUtils.toWorkerInfo).toSeq)
new HandleResponse().success(success).message(msg)
if (master.isMasterActive == 1) {
val (success, msg) = httpService.exclude(
request.getAdd.asScala.map(ApiUtils.toWorkerInfo).toSeq,
request.getRemove.asScala.map(ApiUtils.toWorkerInfo).toSeq)
new HandleResponse().success(success).message(msg)
} else {
throw new BadRequestException(
akpatnam25 marked this conversation as resolved.
Show resolved Hide resolved
s"This operation can only be done from a master that has the LEADER role.")
}
}

@ApiResponse(
Expand All @@ -88,9 +93,15 @@ class WorkerResource extends ApiRequestContext {
@POST
@Path("/remove_unavailable")
def removeWorkersUnavailableInfo(request: RemoveWorkersUnavailableInfoRequest): HandleResponse = {
val (success, msg) = master.removeWorkersUnavailableInfo(
request.getWorkers.asScala.map(ApiUtils.toWorkerInfo).toSeq)
new HandleResponse().success(success).message(msg)
if (master.isMasterActive == 1) {
val (success, msg) = master.removeWorkersUnavailableInfo(
request.getWorkers.asScala.map(ApiUtils.toWorkerInfo).toSeq)
new HandleResponse().success(success).message(msg)
} else {
throw new BadRequestException(
s"This operation can only be done from a master that has the LEADER role.")
}

}

@ApiResponse(
Expand Down Expand Up @@ -124,23 +135,28 @@ class WorkerResource extends ApiRequestContext {
@POST
@Path("/events")
def sendWorkerEvents(request: SendWorkerEventRequest): HandleResponse = {
if (request.getEventType == SendWorkerEventRequest.EventTypeEnum.NONE || request.getWorkers.isEmpty) {
throw new BadRequestException(
s"eventType(${request.getEventType}) and workers(${request.getWorkers}) are required")
}
val workers = request.getWorkers.asScala.map(ApiUtils.toWorkerInfo).toSeq
val (filteredWorkers, unknownWorkers) = workers.partition(statusSystem.workers.contains)
if (filteredWorkers.isEmpty) {
if (master.isMasterActive == 1) {
if (request.getEventType == SendWorkerEventRequest.EventTypeEnum.NONE || request.getWorkers.isEmpty) {
throw new BadRequestException(
s"eventType(${request.getEventType}) and workers(${request.getWorkers}) are required")
}
val workers = request.getWorkers.asScala.map(ApiUtils.toWorkerInfo).toSeq
val (filteredWorkers, unknownWorkers) = workers.partition(statusSystem.workers.contains)
if (filteredWorkers.isEmpty) {
throw new BadRequestException(
s"None of the workers are known: ${unknownWorkers.map(_.readableAddress).mkString(", ")}")
}
val (success, msg) = httpService.handleWorkerEvent(request.getEventType.toString, workers)
val finalMsg =
if (unknownWorkers.isEmpty) {
msg
} else {
s"${msg}\n(Unknown workers: ${unknownWorkers.map(_.readableAddress).mkString(", ")})"
}
new HandleResponse().success(success).message(finalMsg)
} else {
throw new BadRequestException(
s"None of the workers are known: ${unknownWorkers.map(_.readableAddress).mkString(", ")}")
s"This operation can only be done from a master that has the LEADER role.")
}
val (success, msg) = httpService.handleWorkerEvent(request.getEventType.toString, workers)
val finalMsg =
if (unknownWorkers.isEmpty) {
msg
} else {
s"${msg}\n(Unknown workers: ${unknownWorkers.map(_.readableAddress).mkString(", ")})"
}
new HandleResponse().success(success).message(finalMsg)
}
}
Loading