svn commit: r1488865 - in /hadoop/common/branches/branch-1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java src/test/org/apache/hadoop/hdfs/server/balancer/TestBalancerWithNo
Author: szetszwo
Date: Mon Jun 3 07:12:06 2013
New Revision: 1488865
URL: http://svn.apache.org/r1488865
Log:
HDFS-4261. Fix bugs in Balaner causing infinite loop and
TestBalancerWithNodeGroup timeing out. Contributed by Junping Du
Modified:
hadoop/common/branches/branch-1/CHANGES.txt
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/balancer/TestBalancerWithNodeGroup.java
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1488865r1=1488864r2=1488865view=diff
==
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon Jun 3 07:12:06 2013
@@ -58,6 +58,9 @@ Release 1.3.0 - unreleased
HADOOP-8981. TestMetricsSystemImpl fails on Windows. (Xuan Gong, backported
by Chris Nauroth via suresh)
+HDFS-4261. Fix bugs in Balaner causing infinite loop and
+TestBalancerWithNodeGroup timeing out. (Junping Du via szetszwo)
+
Release 1.2.1 - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java?rev=1488865r1=1488864r2=1488865view=diff
==
---
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java
(original)
+++
hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/balancer/Balancer.java
Mon Jun 3 07:12:06 2013
@@ -193,6 +193,8 @@ public class Balancer implements Tool {
*/
public static final int MAX_NUM_CONCURRENT_MOVES = 5;
+ public static final int MAX_NO_PENDING_BLOCK_ITERATIONS = 5;
+
private Configuration conf;
private double threshold = 10D;
@@ -746,6 +748,7 @@ public class Balancer implements Tool {
long startTime = Util.now();
this.blocksToReceive = 2*scheduledSize;
boolean isTimeUp = false;
+ int noPendingBlockIteration = 0;
while(!isTimeUp scheduledSize 0
(!srcBlockList.isEmpty() || blocksToReceive 0)) {
PendingBlockMove pendingBlock = chooseNextBlockToMove();
@@ -769,7 +772,15 @@ public class Balancer implements Tool {
LOG.warn(StringUtils.stringifyException(e));
return;
}
-}
+} else {
+ // source node cannot find a pendingBlockToMove, iteration +1
+ noPendingBlockIteration++;
+ // in case no blocks can be moved for source node's task,
+ // jump out of while-loop after 5 iterations.
+ if (noPendingBlockIteration = MAX_NO_PENDING_BLOCK_ITERATIONS) {
+scheduledSize = 0;
+ }
+}
// check if time is up or not
if (Util.now()-startTime MAX_ITERATION_TIME) {
@@ -1496,7 +1507,11 @@ public class Balancer implements Tool {
Formatter formatter = new Formatter(System.out);
System.out.println(Time Stamp Iteration# Bytes Already
Moved Bytes Left To Move Bytes Being Moved);
int iterations = 0;
+
while (true) {
+// clean all lists at the beginning of balancer iteration.
+resetData();
+
/* get all live datanodes of a cluster and their disk usage
* decide the number of bytes need to be moved
*/
@@ -1547,9 +1562,6 @@ public class Balancer implements Tool {
return NO_MOVE_PROGRESS;
}
}
-
-// clean all lists
-resetData();
try {
Thread.sleep(2*conf.getLong(dfs.heartbeat.interval, 3));
Modified:
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/balancer/TestBalancerWithNodeGroup.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/balancer/TestBalancerWithNodeGroup.java?rev=1488865r1=1488864r2=1488865view=diff
==
---
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/balancer/TestBalancerWithNodeGroup.java
(original)
+++
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/balancer/TestBalancerWithNodeGroup.java
Mon Jun 3 07:12:06 2013
@@ -216,7 +216,7 @@ public class TestBalancerWithNodeGroup {
* to n0 or n1 as balancer policy with node group. Thus, we expect the
balancer
* to end in 5 iterations without move block process.
*/
- @Test
+ @Test(timeout=6)
public void testBalancerEndInNoMoveProgress() throws Exception {
Configuration conf = createConf();
long[] capacities = new
svn commit: r1488873 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: szetszwo Date: Mon Jun 3 07:29:15 2013 New Revision: 1488873 URL: http://svn.apache.org/r1488873 Log: Move HADOOP-8469 and HADOOP-8470 to 2.1.0-beta in CHANGES.txt. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1488873r1=1488872r2=1488873view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jun 3 07:29:15 2013 @@ -12,12 +12,6 @@ Trunk (Unreleased) HADOOP-8561. Introduce HADOOP_PROXY_USER for secure impersonation in child hadoop client processes. (Yu Gao via llu) -HADOOP-8469. Make NetworkTopology class pluggable. (Junping Du via -szetszwo) - -HADOOP-8470. Add NetworkTopologyWithNodeGroup, a 4-layer implementation -of NetworkTopology. (Junping Du via szetszwo) - IMPROVEMENTS HADOOP-8017. Configure hadoop-main pom to get rid of M2E plugin execution @@ -401,6 +395,12 @@ Release 2.1.0-beta - UNRELEASED Azure environments. (See breakdown of tasks below for subtasks and contributors) +HADOOP-8469. Make NetworkTopology class pluggable. (Junping Du via +szetszwo) + +HADOOP-8470. Add NetworkTopologyWithNodeGroup, a 4-layer implementation +of NetworkTopology. (Junping Du via szetszwo) + IMPROVEMENTS HADOOP-9253. Capture ulimit info in the logs at service start time.
svn commit: r1489026 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Mon Jun 3 15:27:28 2013 New Revision: 1489026 URL: http://svn.apache.org/r1489026 Log: Move HADOOP-9397 to 2.1.0-beta after merging it into branch-2. Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1489026r1=1489025r2=1489026view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jun 3 15:27:28 2013 @@ -334,8 +334,6 @@ Trunk (Unreleased) HADOOP-9099. NetUtils.normalizeHostName fails on domains where UnknownHost resolves to an IP address. (Ivan Mitic via suresh) -HADOOP-9397. Incremental dist tar build fails (Chris Nauroth via jlowe) - HADOOP-9431 TestSecurityUtil#testLocalHostNameForNullOrWild on systems where hostname contains capital letters (Chris Nauroth via sanjay) @@ -739,6 +737,8 @@ Release 2.1.0-beta - UNRELEASED HADOOP-9553. TestAuthenticationToken fails on Windows. (Arpit Agarwal via suresh) +HADOOP-9397. Incremental dist tar build fails (Chris Nauroth via jlowe) + HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos) HADOOP-9605. Update junit dependency. (Timothy St. Clair via cos)
svn commit: r1489065 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java
Author: cmccabe
Date: Mon Jun 3 17:14:27 2013
New Revision: 1489065
URL: http://svn.apache.org/r1489065
Log:
HDFS-3934. duplicative dfs_hosts entries handled wrong. (cmccabe)
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java?rev=1489065r1=1489064r2=1489065view=diff
==
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/HostsFileReader.java
Mon Jun 3 17:14:27 2013
@@ -48,7 +48,8 @@ public class HostsFileReader {
refresh();
}
- private void readFileToSet(String filename, SetString set) throws
IOException {
+ public static void readFileToSet(String type,
+ String filename, SetString set) throws IOException {
File file = new File(filename);
FileInputStream fis = new FileInputStream(file);
BufferedReader reader = null;
@@ -64,8 +65,9 @@ public class HostsFileReader {
break;
}
if (!nodes[i].isEmpty()) {
- LOG.info(Adding + nodes[i] + to the list of hosts from +
filename);
- set.add(nodes[i]); // might need to add canonical name
+ LOG.info(Adding + nodes[i] + to the list of + type +
+ hosts from + filename);
+ set.add(nodes[i]);
}
}
}
@@ -82,13 +84,13 @@ public class HostsFileReader {
LOG.info(Refreshing hosts (include/exclude) list);
if (!includesFile.isEmpty()) {
SetString newIncludes = new HashSetString();
- readFileToSet(includesFile, newIncludes);
+ readFileToSet(included, includesFile, newIncludes);
// switch the new hosts that are to be included
includes = newIncludes;
}
if (!excludesFile.isEmpty()) {
SetString newExcludes = new HashSetString();
- readFileToSet(excludesFile, newExcludes);
+ readFileToSet(excluded, excludesFile, newExcludes);
// switch the excluded hosts
excludes = newExcludes;
}
svn commit: r1489118 - /hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt
Author: cos Date: Mon Jun 3 19:30:28 2013 New Revision: 1489118 URL: http://svn.apache.org/r1489118 Log: Setting optimistic release date in the CHANGES.txt Modified: hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1489118r1=1489117r2=1489118view=diff == --- hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.0.5-alpha/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jun 3 19:30:28 2013 @@ -1,6 +1,6 @@ Hadoop Change Log -Release 2.0.5-alpha - UNRELEASED +Release 2.0.5-alpha - 06/06/2013 INCOMPATIBLE CHANGES
svn commit: r1489127 - /hadoop/common/tags/2.0.5-alpha-rc2/
Author: cos Date: Mon Jun 3 19:45:34 2013 New Revision: 1489127 URL: http://svn.apache.org/r1489127 Log: Tagging 2.0.5-alpha-rc2 release Added: hadoop/common/tags/2.0.5-alpha-rc2/ (props changed) - copied from r1489118, hadoop/common/branches/branch-2.0.5-alpha/ Propchange: hadoop/common/tags/2.0.5-alpha-rc2/ -- --- svn:ignore (added) +++ svn:ignore Mon Jun 3 19:45:34 2013 @@ -0,0 +1,5 @@ +.classpath +.git +.project +.settings +target Propchange: hadoop/common/tags/2.0.5-alpha-rc2/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jun 3 19:45:34 2013 @@ -0,0 +1,3 @@ +/hadoop/common/branches/HDFS-3042:1306184-1342109 +/hadoop/common/branches/branch-0.23-PB:1227776-1294021 +/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1301308,1301312,1301820,1301871,1302624, 1302704-1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1329319,1333557,1334216,1342112,1348207,1349124,1349616,1351818,1361813,1373683,1374696,1375450,1375829,1379646,1400347,1430682,1430688,1440245,1445965,1455316,1465121
svn commit: r1489128 - in /hadoop/common/tags: 2.0.5-alpha-rc2/ release-2.0.5-alpha-rc2/
Author: cos Date: Mon Jun 3 19:49:18 2013 New Revision: 1489128 URL: http://svn.apache.org/r1489128 Log: Wrong name of the release-2.0.5-alpha-rc2 tag Added: hadoop/common/tags/release-2.0.5-alpha-rc2/ (props changed) - copied from r1489127, hadoop/common/tags/2.0.5-alpha-rc2/ Removed: hadoop/common/tags/2.0.5-alpha-rc2/ Propchange: hadoop/common/tags/release-2.0.5-alpha-rc2/ -- --- svn:ignore (added) +++ svn:ignore Mon Jun 3 19:49:18 2013 @@ -0,0 +1,5 @@ +.classpath +.git +.project +.settings +target Propchange: hadoop/common/tags/release-2.0.5-alpha-rc2/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jun 3 19:49:18 2013 @@ -0,0 +1,3 @@ +/hadoop/common/branches/HDFS-3042:1306184-1342109 +/hadoop/common/branches/branch-0.23-PB:1227776-1294021 +/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928,1243065,1243104,1244766,1245751,1245762,1293419,1295061,1295227,1296556,1298044,1298696,1298700,1299045,1299434,1299963,1301308,1301312,1301820,1301871,1302624, 1302704-1302705,1303474,1304063,1304099,1304112,1304118,1305230,1309625,1310185,1311556,1312029,1329319,1333557,1334216,1342112,1348207,1349124,1349616,1351818,1361813,1373683,1374696,1375450,1375829,1379646,1400347,1430682,1430688,1440245,1445965,1455316,1465121
svn commit: r1489136 - /hadoop/common/trunk/dev-support/smart-apply-patch.sh
Author: jeagles
Date: Mon Jun 3 20:00:16 2013
New Revision: 1489136
URL: http://svn.apache.org/r1489136
Log:
HADOOP-9614. smart-test-patch.sh hangs for new version of patch (2.7.1) (Ravi
Prakash via jeagles)
Modified:
hadoop/common/trunk/dev-support/smart-apply-patch.sh
Modified: hadoop/common/trunk/dev-support/smart-apply-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/dev-support/smart-apply-patch.sh?rev=1489136r1=1489135r2=1489136view=diff
==
--- hadoop/common/trunk/dev-support/smart-apply-patch.sh (original)
+++ hadoop/common/trunk/dev-support/smart-apply-patch.sh Mon Jun 3 20:00:16
2013
@@ -50,7 +50,12 @@ if $PATCH -p0 -E --dry-run $PATCH_FILE
TMP2=/tmp/tmp.paths.2.$$
TOCLEAN=$TOCLEAN $TMP2
- grep '^patching file ' $TMP | awk '{print $3}' | grep -v /dev/null | sort |
uniq $TMP2
+ egrep '^patching file |^checking file ' $TMP | awk '{print $3}' | grep -v
/dev/null | sort | uniq $TMP2
+
+ if [ ! -s $TMP2 ]; then
+echo Error: Patch dryrun couldn't detect changes the patch would make.
Exiting.
+cleanup 1
+ fi
#first off check that all of the files do not exist
FOUND_ANY=0
svn commit: r1489136 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jeagles Date: Mon Jun 3 20:00:16 2013 New Revision: 1489136 URL: http://svn.apache.org/r1489136 Log: HADOOP-9614. smart-test-patch.sh hangs for new version of patch (2.7.1) (Ravi Prakash via jeagles) Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1489136r1=1489135r2=1489136view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jun 3 20:00:16 2013 @@ -1777,6 +1777,9 @@ Release 0.23.8 - UNRELEASED HADOOP-9504. MetricsDynamicMBeanBase has concurrency issues in createMBeanInfo (Liang Xie via jlowe) +HADOOP-9614. smart-test-patch.sh hangs for new version of patch (2.7.1) +(Ravi Prakash via jeagles) + Release 0.23.7 - UNRELEASED INCOMPATIBLE CHANGES
svn commit: r1489153 - /hadoop/common/branches/branch-2/dev-support/smart-apply-patch.sh
Author: jeagles
Date: Mon Jun 3 20:25:11 2013
New Revision: 1489153
URL: http://svn.apache.org/r1489153
Log:
HADOOP-9614. smart-test-patch.sh hangs for new version of patch (2.7.1) (Ravi
Prakash via jeagles)
Modified:
hadoop/common/branches/branch-2/dev-support/smart-apply-patch.sh
Modified: hadoop/common/branches/branch-2/dev-support/smart-apply-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/dev-support/smart-apply-patch.sh?rev=1489153r1=1489152r2=1489153view=diff
==
--- hadoop/common/branches/branch-2/dev-support/smart-apply-patch.sh (original)
+++ hadoop/common/branches/branch-2/dev-support/smart-apply-patch.sh Mon Jun 3
20:25:11 2013
@@ -49,7 +49,12 @@ if $PATCH -p0 -E --dry-run $PATCH_FILE
TMP2=/tmp/tmp.paths.2.$$
TOCLEAN=$TOCLEAN $TMP2
- grep '^patching file ' $TMP | awk '{print $3}' | grep -v /dev/null | sort |
uniq $TMP2
+ egrep '^patching file |^checking file ' $TMP | awk '{print $3}' | grep -v
/dev/null | sort | uniq $TMP2
+
+ if [ ! -s $TMP2 ]; then
+echo Error: Patch dryrun couldn't detect changes the patch would make.
Exiting.
+cleanup 1
+ fi
#first off check that all of the files do not exist
FOUND_ANY=0
svn commit: r1489153 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jeagles Date: Mon Jun 3 20:25:11 2013 New Revision: 1489153 URL: http://svn.apache.org/r1489153 Log: HADOOP-9614. smart-test-patch.sh hangs for new version of patch (2.7.1) (Ravi Prakash via jeagles) Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1489153r1=1489152r2=1489153view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jun 3 20:25:11 2013 @@ -1438,6 +1438,9 @@ Release 0.23.8 - UNRELEASED HADOOP-9504. MetricsDynamicMBeanBase has concurrency issues in createMBeanInfo (Liang Xie via jlowe) +HADOOP-9614. smart-test-patch.sh hangs for new version of patch (2.7.1) +(Ravi Prakash via jeagles) + Release 0.23.7 - UNRELEASED INCOMPATIBLE CHANGES
svn commit: r1489159 - /hadoop/common/branches/branch-0.23/dev-support/smart-apply-patch.sh
Author: jeagles
Date: Mon Jun 3 20:33:14 2013
New Revision: 1489159
URL: http://svn.apache.org/r1489159
Log:
HADOOP-9614. smart-test-patch.sh hangs for new version of patch (2.7.1) (Ravi
Prakash via jeagles)
Modified:
hadoop/common/branches/branch-0.23/dev-support/smart-apply-patch.sh
Modified: hadoop/common/branches/branch-0.23/dev-support/smart-apply-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/dev-support/smart-apply-patch.sh?rev=1489159r1=1489158r2=1489159view=diff
==
--- hadoop/common/branches/branch-0.23/dev-support/smart-apply-patch.sh
(original)
+++ hadoop/common/branches/branch-0.23/dev-support/smart-apply-patch.sh Mon Jun
3 20:33:14 2013
@@ -49,7 +49,12 @@ if $PATCH -p0 -E --dry-run $PATCH_FILE
TMP2=/tmp/tmp.paths.2.$$
TOCLEAN=$TOCLEAN $TMP2
- grep '^patching file ' $TMP | awk '{print $3}' | grep -v /dev/null | sort |
uniq $TMP2
+ egrep '^patching file |^checking file ' $TMP | awk '{print $3}' | grep -v
/dev/null | sort | uniq $TMP2
+
+ if [ ! -s $TMP2 ]; then
+echo Error: Patch dryrun couldn't detect changes the patch would make.
Exiting.
+cleanup 1
+ fi
#first off check that all of the files do not exist
FOUND_ANY=0
svn commit: r1489159 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jeagles Date: Mon Jun 3 20:33:14 2013 New Revision: 1489159 URL: http://svn.apache.org/r1489159 Log: HADOOP-9614. smart-test-patch.sh hangs for new version of patch (2.7.1) (Ravi Prakash via jeagles) Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1489159r1=1489158r2=1489159view=diff == --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jun 3 20:33:14 2013 @@ -36,6 +36,9 @@ Release 0.23.8 - UNRELEASED HADOOP-9504. MetricsDynamicMBeanBase has concurrency issues in createMBeanInfo (Liang Xie via jlowe) +HADOOP-9614. smart-test-patch.sh hangs for new version of patch (2.7.1) +(Ravi Prakash via jeagles) + Release 0.23.7 - 2013-04-18 INCOMPATIBLE CHANGES
svn commit: r1489239 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: ./ src/main/native/src/org/apache/hadoop/io/compress/snappy/
Author: suresh Date: Tue Jun 4 00:06:26 2013 New Revision: 1489239 URL: http://svn.apache.org/r1489239 Log: HADOOP-9481. Merge r1481191 from trunk Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1489239r1=1489238r2=1489239view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jun 4 00:06:26 2013 @@ -207,6 +207,9 @@ Release 2.1.0-beta - UNRELEASED (which in turn throws SIGABRT) causing client crashes. (Colin Patrick McCabe via atm) +HADOOP-9481. Broken conditional logic with HADOOP_SNAPPY_LIBRARY. (Vadim +Bondarev via atm) + BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS HADOOP-8924. Hadoop Common creating package-info.java must not depend on Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c?rev=1489239r1=1489238r2=1489239view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyCompressor.c Tue Jun 4 00:06:26 2013 @@ -17,6 +17,8 @@ */ +#include org_apache_hadoop_io_compress_snappy.h + #if defined HADOOP_SNAPPY_LIBRARY #include stdio.h @@ -28,7 +30,6 @@ #include config.h #endif // UNIX -#include org_apache_hadoop_io_compress_snappy.h #include org_apache_hadoop_io_compress_snappy_SnappyCompressor.h #define JINT_MAX 0x7fff Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c?rev=1489239r1=1489238r2=1489239view=diff == --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/compress/snappy/SnappyDecompressor.c Tue Jun 4 00:06:26 2013 @@ -16,6 +16,7 @@ * limitations under the License. */ +#include org_apache_hadoop_io_compress_snappy.h #if defined HADOOP_SNAPPY_LIBRARY @@ -24,11 +25,10 @@ #include string.h #ifdef UNIX -#include config.h #include dlfcn.h +#include config.h #endif -#include org_apache_hadoop_io_compress_snappy.h #include org_apache_hadoop_io_compress_snappy_SnappyDecompressor.h static jfieldID SnappyDecompressor_clazz;
svn commit: r1489250 - in /hadoop/common/branches/branch-2: hadoop-project/pom.xml hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
Author: jlowe
Date: Tue Jun 4 00:29:37 2013
New Revision: 1489250
URL: http://svn.apache.org/r1489250
Log:
HADOOP-9287. Parallel-testing hadoop-common. Contributed by Andrey Klochkov
Modified:
hadoop/common/branches/branch-2/hadoop-project/pom.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1489250r1=1489249r2=1489250view=diff
==
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Tue Jun 4 00:29:37
2013
@@ -36,6 +36,9 @@
test.exclude_/test.exclude
test.exclude.pattern_/test.exclude.pattern
+!-- number of threads/forks to use when running tests in parallel, see
parallel-tests profile --
+testsThreadCount4/testsThreadCount
+
!-- platform encoding override --
project.build.sourceEncodingUTF-8/project.build.sourceEncoding
project.reporting.outputEncodingUTF-8/project.reporting.outputEncoding
@@ -1004,5 +1007,23 @@
/plugins
/build
/profile
+!-- Copied into specific modules supporting parallel testing. Will be
uncommented as soon as all modules support this.
+profile
+ idparallel-tests/id
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-surefire-plugin/artifactId
+configuration
+ forkModeperthread/forkMode
+ threadCount${testsThreadCount}/threadCount
+ parallelclasses/parallel
+/configuration
+ /plugin
+/plugins
+ /build
+/profile
+--
/profiles
/project
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java?rev=1489250r1=1489249r2=1489250view=diff
==
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestDistCpViewFs.java
Tue Jun 4 00:29:37 2013
@@ -56,14 +56,14 @@ public class TestDistCpViewFs {
public static void setup() throws URISyntaxException{
try {
Path fswd = FileSystem.get(getConf()).getWorkingDirectory();
- Configuration vConf = ViewFileSystemTestSetup.createConfig();
- ConfigUtil.addLink(vConf, /usr, new URI(fswd.toString()));
+ Configuration vConf = ViewFileSystemTestSetup.createConfig(false);
+ ConfigUtil.addLink(vConf, /usr, new URI(fswd.toString()));
fs = FileSystem.get(FsConstants.VIEWFS_URI, vConf);
fs.setWorkingDirectory(new Path(/usr));
listFile = new Path(target/tmp/listing).makeQualified(fs.getUri(),
fs.getWorkingDirectory());
target = new Path(target/tmp/target).makeQualified(fs.getUri(),
- fs.getWorkingDirectory());
+ fs.getWorkingDirectory());
root = new Path(target/tmp).makeQualified(fs.getUri(),
fs.getWorkingDirectory()).toString();
TestDistCpUtils.delete(fs, root);
svn commit: r1489258 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: jlowe Date: Tue Jun 4 00:34:42 2013 New Revision: 1489258 URL: http://svn.apache.org/r1489258 Log: Move HADOOP-9287 in CHANGES.txt after committing to branch-2 Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1489258r1=1489257r2=1489258view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jun 4 00:34:42 2013 @@ -145,8 +145,6 @@ Trunk (Unreleased) HADOOP-9540. Expose the InMemoryS3 and S3N FilesystemStores implementations for Unit testing. (Hari via stevel) -HADOOP-9287. Parallel-testing hadoop-common (Andrey Klochkov via jlowe) - BUG FIXES HADOOP-9451. Fault single-layer config if node group topology is enabled. @@ -453,6 +451,8 @@ Release 2.1.0-beta - UNRELEASED HADOOP-7391 Document Interface Classification from HADOOP-5073 (sanjay Radia) +HADOOP-9287. Parallel-testing hadoop-common (Andrey Klochkov via jlowe) + OPTIMIZATIONS HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs
svn commit: r1489261 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
Author: suresh Date: Tue Jun 4 00:56:06 2013 New Revision: 1489261 URL: http://svn.apache.org/r1489261 Log: HADOOP-9481. Move from trunk to release 2.1.0 section Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1489261r1=1489260r2=1489261view=diff == --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jun 4 00:56:06 2013 @@ -344,9 +344,6 @@ Trunk (Unreleased) HADOOP-9433 TestLocalFileSystem#testHasFileDescriptor leaks file handle (Chris Nauroth via sanjay) -HADOOP-9481. Broken conditional logic with HADOOP_SNAPPY_LIBRARY. (Vadim -Bondarev via atm) - HADOOP-9593. stack trace printed at ERROR for all yarn clients without hadoop.home set (stevel) @@ -565,6 +562,9 @@ Release 2.1.0-beta - UNRELEASED (which in turn throws SIGABRT) causing client crashes. (Colin Patrick McCabe via atm) +HADOOP-9481. Broken conditional logic with HADOOP_SNAPPY_LIBRARY. (Vadim +Bondarev via atm) + BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS HADOOP-8924. Hadoop Common creating package-info.java must not depend on
