Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-6649. RollingLevelDBTimelineServer throws RuntimeException if object decoding ever fails runtime exception. Contributed by Jon Eagles. 

(cherry picked from commit 4369690ce6)
This commit is contained in:
Nathan Roberts 2017-05-30 16:10:33 -05:00
parent 5b0baeab5e
commit c112bf6838
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/RollingLevelDBTimelineStore.java
View File

@ -473,9 +473,16 @@ public class RollingLevelDBTimelineStore extends AbstractService implements
}
} else if (key[prefixlen] == OTHER_INFO_COLUMN[0]) {
if (otherInfo) {
entity.addOtherInfo(
parseRemainingKey(key, prefixlen + OTHER_INFO_COLUMN.length),
fstConf.asObject(iterator.peekNext().getValue()));
Object o = null;
String keyStr = parseRemainingKey(key,
prefixlen + OTHER_INFO_COLUMN.length);
try {
o = fstConf.asObject(iterator.peekNext().getValue());
entity.addOtherInfo(keyStr, o);
} catch (Exception e) {
LOG.warn("Error while decoding "
+ entityId + ":otherInfo:" + keyStr, e);
}
}
} else if (key[prefixlen] == RELATED_ENTITIES_COLUMN[0]) {
if (relatedEntities) {
@ -1338,7 +1345,12 @@ public class RollingLevelDBTimelineStore extends AbstractService implements
TimelineEvent event = new TimelineEvent();
event.setTimestamp(ts);
event.setEventType(tstype);
Object o = fstConf.asObject(value);
Object o = null;
try {
o = fstConf.asObject(value);
} catch (Exception e) {
LOG.warn("Error while decoding " + tstype, e);
}
if (o == null) {
event.setEventInfo(null);
} else if (o instanceof Map) {
@ -1362,8 +1374,13 @@ public class RollingLevelDBTimelineStore extends AbstractService implements
KeyParser kp = new KeyParser(key, offset);
String name = kp.getNextString();
byte[] bytes = kp.getRemainingBytes();
Object value = fstConf.asObject(bytes);
entity.addPrimaryFilter(name, value);
Object value = null;
try {
value = fstConf.asObject(bytes);
entity.addPrimaryFilter(name, value);
} catch (Exception e) {
LOG.warn("Error while decoding " + name, e);
}
}
/**