-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a TaskReport for "kill" tasks (#15023)
- Add `KillTaskReport` that contains stats for `numSegmentsKilled`, `numBatchesProcessed`, `numSegmentsMarkedAsUnused` - Fix bug where exception message had no formatter but was was still being passed some args. - Add some comments regarding deprecation of `markAsUnused` flag.
- Loading branch information
Showing
6 changed files
with
237 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
133 changes: 133 additions & 0 deletions
133
indexing-service/src/main/java/org/apache/druid/indexing/common/KillTaskReport.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.apache.druid.indexing.common; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import java.util.Objects; | ||
|
|
||
| public class KillTaskReport implements TaskReport | ||
| { | ||
| public static final String REPORT_KEY = "killUnusedSegments"; | ||
|
|
||
| private final String taskId; | ||
| private final Stats stats; | ||
|
|
||
| @JsonCreator | ||
| public KillTaskReport( | ||
| @JsonProperty("taskId") String taskId, | ||
| @JsonProperty("payload") Stats stats | ||
| ) | ||
| { | ||
| this.taskId = taskId; | ||
| this.stats = stats; | ||
| } | ||
|
|
||
| @Override | ||
| @JsonProperty | ||
| public String getTaskId() | ||
| { | ||
| return taskId; | ||
| } | ||
|
|
||
| @Override | ||
| public String getReportKey() | ||
| { | ||
| return REPORT_KEY; | ||
| } | ||
|
|
||
| @Override | ||
| @JsonProperty | ||
| public Object getPayload() | ||
| { | ||
| return stats; | ||
| } | ||
|
|
||
| public static class Stats | ||
| { | ||
| private final int numSegmentsKilled; | ||
| private final int numBatchesProcessed; | ||
| private final Integer numSegmentsMarkedAsUnused; | ||
|
|
||
| @JsonCreator | ||
| public Stats( | ||
| @JsonProperty("numSegmentsKilled") int numSegmentsKilled, | ||
| @JsonProperty("numBatchesProcessed") int numBatchesProcessed, | ||
| @JsonProperty("numSegmentsMarkedAsUnused") @Nullable Integer numSegmentsMarkedAsUnused | ||
| ) | ||
| { | ||
| this.numSegmentsKilled = numSegmentsKilled; | ||
| this.numBatchesProcessed = numBatchesProcessed; | ||
| this.numSegmentsMarkedAsUnused = numSegmentsMarkedAsUnused; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public int getNumSegmentsKilled() | ||
| { | ||
| return numSegmentsKilled; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public int getNumBatchesProcessed() | ||
| { | ||
| return numBatchesProcessed; | ||
| } | ||
|
|
||
| @Nullable | ||
| @JsonProperty | ||
| public Integer getNumSegmentsMarkedAsUnused() | ||
| { | ||
| return numSegmentsMarkedAsUnused; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) | ||
| { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
| Stats that = (Stats) o; | ||
| return numSegmentsKilled == that.numSegmentsKilled | ||
| && numBatchesProcessed == that.numBatchesProcessed | ||
| && Objects.equals(this.numSegmentsMarkedAsUnused, that.numSegmentsMarkedAsUnused); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() | ||
| { | ||
| return Objects.hash(numSegmentsKilled, numBatchesProcessed, numSegmentsMarkedAsUnused); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() | ||
| { | ||
| return "Stats{" + | ||
| "numSegmentsKilled=" + numSegmentsKilled + | ||
| ", numBatchesProcessed=" + numBatchesProcessed + | ||
| ", numSegmentsMarkedAsUnused=" + numSegmentsMarkedAsUnused + | ||
| '}'; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.