Skip to content

TEZ-4250: Optimise TaskImpl::getCounters. #295

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
abstractdog merged 4 commits into from
Jun 23, 2023
Merged

TEZ-4250: Optimise TaskImpl::getCounters. #295

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c539e82
TEZ-4250: Optimise TaskImpl::getCounters.
ayushtkn Jun 21, 2023
daaedd2
Fix Checkstyle.
ayushtkn Jun 21, 2023
0ac0ff0
Fix Checkstyle.
ayushtkn Jun 21, 2023
1663817
Refactor code for readablility.
ayushtkn Jun 23, 2023
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
8 changes: 8 additions & 0 deletions tez-dag/src/main/java/org/apache/tez/dag/app/dag/TaskAttempt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;

import com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.yarn.api.records.Container;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.NodeId;
Expand Down Expand Up @@ -63,13 +64,20 @@ public void setLocalityCounter(DAGCounter localityCounter) {
}
}
}

@VisibleForTesting
public void setCounters(TezCounters counters) {
this.counters = counters;
}
}

Task getTask();
TaskAttemptReport getReport();
List<String> getDiagnostics();
TaskAttemptTerminationCause getTerminationCause();
TezCounters getCounters();
@VisibleForTesting
void setCounters(TezCounters counters);
float getProgress();
TaskAttemptState getState();
TaskAttemptState getStateNoLock();
Expand Down
11 changes: 11 additions & 0 deletions tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskAttemptImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,17 @@ public TezCounters getCounters() {
readLock.unlock();
}
}

@VisibleForTesting
@Override
public void setCounters(TezCounters counters) {
writeLock.lock();
try {
reportedStatus.setCounters(counters);
} finally {
writeLock.unlock();
}
}

TaskStatistics getStatistics() {
return this.statistics;
Expand Down
17 changes: 10 additions & 7 deletions tez-dag/src/main/java/org/apache/tez/dag/app/dag/impl/TaskImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,15 +465,19 @@ public TaskReport getReport() {

@Override
public TezCounters getCounters() {
TezCounters counters = new TezCounters();
counters.incrAllCounters(this.counters);
TezCounters tezCounters = null;
if (getVertex().isSpeculationEnabled()) {
tezCounters = new TezCounters();
tezCounters.incrAllCounters(this.counters);
}
readLock.lock();
try {
TaskAttempt bestAttempt = selectBestAttempt();
if (bestAttempt != null) {
counters.incrAllCounters(bestAttempt.getCounters());
if (bestAttempt != null && tezCounters != null) {
Copy link
Contributor

@abstractdog abstractdog Jun 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tezCounters != null only if speculation is enabled due to the recent patch, would it make sense to use that condition here for better readability? I guess it would clarify that we only use "this.counter" and this whole stuff in case of speculation
also, we're returning a non-null counter anyway, would this be clearer as:

TezCounters taskCounters = (bestAttempt != null) ? bestAttempt.getCounters() : TaskAttemptImpl.EMPTY_COUNTERS;

if (isSpeculationEnabled){
  tezCounters.incrAllCounters(taskCounters); 
  return tezCounters;
}
return taskCounters;

Copy link
Member Author

@ayushtkn ayushtkn Jun 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

tezCounters.incrAllCounters(bestAttempt.getCounters());
return tezCounters;
}
return counters;
return (bestAttempt != null) ? bestAttempt.getCounters() : TaskAttemptImpl.EMPTY_COUNTERS;
} finally {
readLock.unlock();
}
Expand Down Expand Up @@ -1522,10 +1526,9 @@ public void transition(TaskImpl task, TaskEvent event) {
void setCounters(TezCounters counters) {
try {
writeLock.lock();
this.counters = counters;
selectBestAttempt().setCounters(counters);
} finally {
writeLock.unlock();
}
}

}