Skip to content

HDFS-16029. Fix ArrayIndexOutOfBoundsException and divide-by-zero in InstrumentationService.Timer.getValues() #8420

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

Open
balodesecurity wants to merge 1 commit into
base: trunk
Choose a base branch
from
+21 −0
Open

HDFS-16029. Fix ArrayIndexOutOfBoundsException and divide-by-zero in InstrumentationService.Timer.getValues() #8420

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
3 changes: 3 additions & 0 deletions ...s/src/main/java/org/apache/hadoop/lib/service/instrumentation/InstrumentationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,9 @@ long[] getValues() {
lock.lock();
try {
long[] values = new long[4];
if (last < 0) {
return values;
}
values[LAST_TOTAL] = total[last];
values[LAST_OWN] = own[last];
int limit = (full) ? size : (last + 1);
Expand Down
18 changes: 18 additions & 0 deletions ...c/test/java/org/apache/hadoop/lib/service/instrumentation/TestInstrumentationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,24 @@ public void timer() throws Exception {
assertEquals(json.get("avgOwn"), values[InstrumentationService.Timer.AVG_OWN]);
}

@Test
public void timerGetValuesBeforeAnyCron() throws Exception {
// HDFS-16029: getValues() on a fresh Timer (last == -1) must not throw
// ArrayIndexOutOfBoundsException or divide-by-zero; it should return zeros.
InstrumentationService.Timer timer = new InstrumentationService.Timer(2);
long[] values = timer.getValues();
assertEquals(4, values.length);
assertEquals(0, values[InstrumentationService.Timer.LAST_TOTAL]);
assertEquals(0, values[InstrumentationService.Timer.LAST_OWN]);
assertEquals(0, values[InstrumentationService.Timer.AVG_TOTAL]);
assertEquals(0, values[InstrumentationService.Timer.AVG_OWN]);

// toJSONString() also calls getValues() via getJSON() — must not throw either
String json = timer.toJSONString();
assertNotNull(json);
assertTrue(json.contains("lastTotal"));
}

@Test
public void sampler() throws Exception {
final long value[] = new long[1];
Expand Down
Loading