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

Revert "MAPREDUCE-6199. AbstractCounters are not reset completely on deserialization (adhoot via rkanter)" 

This reverts commit f9341c1e2c.

Conflicts:
	hadoop-mapreduce-project/CHANGES.txt
This commit is contained in:
Vinod Kumar Vavilapalli 2015-03-31 11:28:51 -07:00
parent 02646ddba2
commit 1c050bd135
4 changed files with 1 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -133,9 +133,6 @@ Release 2.7.0 - UNRELEASED
MAPREDUCE-6045. need close the DataInputStream after open it in
TestMapReduce.java (zxu via rkanter)
MAPREDUCE-6199. AbstractCounters are not reset completely on
deserialization (adhoot via rkanter)
MAPREDUCE-6206. TestAggregatedTransferRate fails on non-US systems (Jens
Rabe via jlowe)

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
View File

@ -307,10 +307,6 @@ public abstract class AbstractCounters<C extends Counter,
fgroups.put(group.getName(), group);
}
int numGroups = WritableUtils.readVInt(in);
if (!groups.isEmpty()) {
groups.clear();
limits.reset();
}
while (numGroups-- > 0) {
limits.checkGroups(groups.size() + 1);
G group = groupFactory.newGenericGroup(

7
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java
View File

@ -124,15 +124,8 @@ public class Limits {
return firstViolation;
}
// This allows initialization of global settings and not for an instance
public static synchronized void reset(Configuration conf) {
isInited = false;
init(conf);
}
// This allows resetting of an instance to allow reuse
public synchronized void reset() {
totalCounters = 0;
firstViolation = null;
}
}

39
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java
View File

@ -17,12 +17,8 @@
*/
package org.apache.hadoop.mapreduce;
import java.io.IOException;
import java.util.Random;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.DataInputBuffer;
import org.apache.hadoop.io.DataOutputBuffer;
import org.junit.Test;
import static org.junit.Assert.*;
@ -74,40 +70,7 @@ public class TestCounters {
testMaxGroups(new Counters());
}
}
@Test public void testResetOnDeserialize() throws IOException {
// Allow only one counterGroup
Configuration conf = new Configuration();
conf.setInt(MRJobConfig.COUNTER_GROUPS_MAX_KEY, 1);
Limits.init(conf);
Counters countersWithOneGroup = new Counters();
countersWithOneGroup.findCounter("firstOf1Allowed", "First group");
boolean caughtExpectedException = false;
try {
countersWithOneGroup.findCounter("secondIsTooMany", "Second group");
}
catch (LimitExceededException _) {
caughtExpectedException = true;
}
assertTrue("Did not throw expected exception",
caughtExpectedException);
Counters countersWithZeroGroups = new Counters();
DataOutputBuffer out = new DataOutputBuffer();
countersWithZeroGroups.write(out);
DataInputBuffer in = new DataInputBuffer();
in.reset(out.getData(), out.getLength());
countersWithOneGroup.readFields(in);
// After reset one should be able to add a group
countersWithOneGroup.findCounter("firstGroupAfterReset", "After reset " +
"limit should be set back to zero");
}
@Test
public void testCountersIncrement() {
Counters fCounters = new Counters();