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

TEZ-4562. Fix Tez Job Analyzer after TEZ_DAG_EXTRA_INFO #354

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −2
Open

TEZ-4562. Fix Tez Job Analyzer after TEZ_DAG_EXTRA_INFO #354

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions ...plugins/tez-history-parser/src/main/java/org/apache/tez/history/parser/ATSFileParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,10 @@ private void parseATSZipFile(File atsFile)
throws IOException, JSONException, TezException, InterruptedException {
final ZipFile atsZipFile = new ZipFile(atsFile);
try {
// Need to keep around the dag to handle merging dag extra info
JSONObject dagJsonSave = null;
Enumeration<? extends ZipEntry> zipEntries = atsZipFile.entries();

while (zipEntries.hasMoreElements()) {
ZipEntry zipEntry = zipEntries.nextElement();
LOG.debug("Processing " + zipEntry.getName());
Expand All @@ -202,6 +205,24 @@ private void parseATSZipFile(File atsFile)
if (dagJson != null) {
//TODO: support for multiple dags per ATS file later.
dagInfo = DagInfo.create(dagJson);
dagJsonSave = dagJson;
}
JSONObject dagExtraInfoJson = jsonObject.optJSONObject(Constants.DAG_EXTRA_INFO);
// We need to merge DAG and DAG_EXTRA_INFO together before processing
if (dagJsonSave != null) {
if (dagExtraInfoJson != null) {
JSONObject dagOtherInfo = dagJsonSave.getJSONObject(Constants.OTHER_INFO);
JSONObject extraOtherInfo = dagExtraInfoJson.getJSONObject(Constants.OTHER_INFO);
@SuppressWarnings("unchecked")
Iterator<String> iter = extraOtherInfo.keys();
while (iter.hasNext()) {
String key = iter.next();
dagOtherInfo.put(key, extraOtherInfo.get(key));
}
// Recreate the dagInfo with the merged DAG and DAG_EXTRA_INFO
// Needs created before vertex processing can begin
dagInfo = DagInfo.create(dagJsonSave);
}
}

//Process vertex
Expand Down
9 changes: 7 additions & 2 deletions ...ns/tez-history-parser/src/main/java/org/apache/tez/history/parser/datamodel/BaseInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,14 @@ public abstract class BaseInfo {
* already generated events should be parsed correctly, hence this workaround.
* Will be investigated in the scope of TEZ-4324.
*/
countersObj = new JSONObject(otherInfoNode.optString(Constants.COUNTERS));
String countersStr = otherInfoNode.optString(Constants.COUNTERS);
if (!countersStr.isEmpty()) {
countersObj = new JSONObject(otherInfoNode.optString(Constants.COUNTERS));
}
}
if (countersObj != null) {
tezCounters = Utils.parseTezCountersFromJSON(countersObj);
}
tezCounters = Utils.parseTezCountersFromJSON(countersObj);

//parse events
eventList = Lists.newArrayList();
Expand Down
1 change: 1 addition & 0 deletions ...s/tez-history-parser/src/main/java/org/apache/tez/history/parser/datamodel/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public class Constants extends ATSConstants {

//constants for ATS data export
public static final String DAG = "dag";
public static final String DAG_EXTRA_INFO = "dag-extra-info";
public static final String VERTICES = "vertices";
public static final String TASKS = "tasks";
public static final String TASK_ATTEMPTS = "task_attempts";
Expand Down
Loading