hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sur...@apache.org
Subject svn commit: r1134144 - in /hadoop/common/branches/branch-0.20-security-204: ./ CHANGES.txt src/core/org/apache/hadoop/ipc/Server.java src/mapred/
Date Fri, 10 Jun 2011 00:41:32 GMT
Author: suresh
Date: Fri Jun 10 00:41:31 2011
New Revision: 1134144

URL: http://svn.apache.org/viewvc?rev=1134144&view=rev
Log:
Merging change 1134140 for HDFS-2057 from branch-0.20-security

Modified:
    hadoop/common/branches/branch-0.20-security-204/   (props changed)
    hadoop/common/branches/branch-0.20-security-204/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/ipc/Server.java
    hadoop/common/branches/branch-0.20-security-204/src/mapred/   (props changed)

Propchange: hadoop/common/branches/branch-0.20-security-204/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 10 00:41:31 2011
@@ -1,5 +1,5 @@
 /hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,1044225
-/hadoop/common/branches/branch-0.20-security:1097202,1098837,1100336
+/hadoop/common/branches/branch-0.20-security:1097202,1098837,1100336,1134140
 /hadoop/common/branches/branch-0.20-security-203:1096071,1097012-1099333,1102071,1128115
 /hadoop/core/branches/branch-0.19:713112
 /hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569

Modified: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt?rev=1134144&r1=1134143&r2=1134144&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-204/CHANGES.txt Fri Jun 10 00:41:31 2011
@@ -76,6 +76,9 @@ Release 0.20.204.0 - unreleased
 
     HDFS-1377. Quota bug for partial blocks allows quotas to be violated. (eli)
 
+    HDFS-2057. Wait time to terminate the threads causes unit tests to
+    take longer time. (Bharath Mundlapudi via suresh)
+
   IMPROVEMENTS
 
     MAPREDUCE-2415. Distribute the user task logs on to multiple disks.

Propchange: hadoop/common/branches/branch-0.20-security-204/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 10 00:41:31 2011
@@ -1,5 +1,5 @@
 /hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,1044225
-/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1097202,1098837,1100336,1134140
 /hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097012-1099333,1102071,1128115
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112

Modified: hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/ipc/Server.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/ipc/Server.java?rev=1134144&r1=1134143&r2=1134144&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/ipc/Server.java
(original)
+++ hadoop/common/branches/branch-0.20-security-204/src/core/org/apache/hadoop/ipc/Server.java
Fri Jun 10 00:41:31 2011
@@ -568,12 +568,6 @@ public abstract class Server {
         }
       }
       readPool.shutdown();
-      try {
-          readPool.awaitTermination(10, TimeUnit.SECONDS);
-      } catch (InterruptedException e) {
-       LOG.info("Exception occured in doStop:" + e.getMessage());
-      }
-      readPool.shutdownNow();
     }
 
     // The method that will return the next reader to work with

Propchange: hadoop/common/branches/branch-0.20-security-204/src/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 10 00:41:31 2011
@@ -1,5 +1,5 @@
 /hadoop/common/branches/branch-0.20/src/mapred:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,1044225
-/hadoop/common/branches/branch-0.20-security/src/mapred:1097202,1098837,1100336
+/hadoop/common/branches/branch-0.20-security/src/mapred:1097202,1098837,1100336,1134140
 /hadoop/common/branches/branch-0.20-security-203/src/mapred:1096071,1097012-1099333,1128115
 /hadoop/core/branches/branch-0.19/src/mapred:713112
 /hadoop/core/trunk/src/mapred:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569



Mime
View raw message