You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by sz...@apache.org on 2011/03/07 21:31:06 UTC
svn commit: r1078924 - in /hadoop/hdfs/branches/HDFS-1052: CHANGES.txt
src/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
Author: szetszwo
Date: Mon Mar 7 20:31:06 2011
New Revision: 1078924
URL: http://svn.apache.org/viewvc?rev=1078924&view=rev
Log:
HDFS-1665. Balancer misuses dfs.heartbeat.interval as milliseconds.
Modified:
hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
Modified: hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/CHANGES.txt?rev=1078924&r1=1078923&r2=1078924&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/CHANGES.txt (original)
+++ hadoop/hdfs/branches/HDFS-1052/CHANGES.txt Mon Mar 7 20:31:06 2011
@@ -680,6 +680,9 @@ Release 0.21.1 - Unreleased
HDFS-1189. Quota counts missed between clear quota and set quota.
(John George via szetszwo)
+ HDFS-1665. Balancer misuses dfs.heartbeat.interval as milliseconds.
+ (szetszwo)
+
Release 0.21.0 - 2010-08-13
INCOMPATIBLE CHANGES
Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java?rev=1078924&r1=1078923&r2=1078924&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java Mon Mar 7 20:31:06 2011
@@ -331,9 +331,7 @@ public class Balancer {
IOUtils.closeSocket(sock);
proxySource.removePendingBlock(this);
- synchronized(target) {
- target.removePendingBlock(this);
- }
+ target.removePendingBlock(this);
synchronized (this ) {
reset();
@@ -1380,8 +1378,9 @@ public class Balancer {
*/
static int run(List<InetSocketAddress> namenodes, final Parameters p,
Configuration conf) throws IOException, InterruptedException {
- final long sleeptime = 2*conf.getLong(
- DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY, 3);
+ final long sleeptime = 2000*conf.getLong(
+ DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_KEY,
+ DFSConfigKeys.DFS_HEARTBEAT_INTERVAL_DEFAULT);
LOG.info("namenodes = " + namenodes);
LOG.info("p = " + p);