You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2015/03/31 22:23:15 UTC
[2/3] hadoop git commit: Revert "MAPREDUCE-6199. AbstractCounters are
not reset completely on deserialization (adhoot via rkanter)"
Revert "MAPREDUCE-6199. AbstractCounters are not reset completely on deserialization (adhoot via rkanter)"
This reverts commit f9341c1e2cffc4e3ac37cb7da4e535ca5c6d3913.
Conflicts:
hadoop-mapreduce-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1c050bd1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1c050bd1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1c050bd1
Branch: refs/heads/branch-2.7
Commit: 1c050bd13538fd6b2abbf65dfc441640c9d0f2cb
Parents: 02646dd
Author: Vinod Kumar Vavilapalli <vi...@apache.org>
Authored: Tue Mar 31 11:28:51 2015 -0700
Committer: Vinod Kumar Vavilapalli <vi...@apache.org>
Committed: Tue Mar 31 11:28:51 2015 -0700
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 --
.../mapreduce/counters/AbstractCounters.java | 4 --
.../hadoop/mapreduce/counters/Limits.java | 7 ----
.../apache/hadoop/mapreduce/TestCounters.java | 39 +-------------------
4 files changed, 1 insertion(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c050bd1/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index ef0a964..9513b50 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -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)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c050bd1/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
index dd81ebb..401bbb2 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/AbstractCounters.java
@@ -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(
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c050bd1/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java
index 9546c8d..3821694 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java
@@ -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;
- }
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c050bd1/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java
index 0215568..83d689c 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestCounters.java
@@ -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();