svn commit: r1375323 - in /hadoop/common/branches/HDFS-3077/hadoop-hdfs-project/hadoop-hdfs: CHANGES.HDFS-3077.txt src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java

[atm]

Author: atm
Date: Mon Aug 20 23:44:14 2012
New Revision: 1375323

URL: http://svn.apache.org/viewvc?rev=1375323&view=rev
Log:
HDFS-3823. QJM: TestQJMWithFaults fails occasionally because of missed setting 
of HTTP port. Contributed by Todd Lipcon and Aaron T. Myers.

Modified:
    
hadoop/common/branches/HDFS-3077/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3077.txt
    
hadoop/common/branches/HDFS-3077/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java

Modified: 
hadoop/common/branches/HDFS-3077/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3077.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3077.txt?rev=1375323&r1=1375322&r2=1375323&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-3077/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3077.txt
 (original)
+++ 
hadoop/common/branches/HDFS-3077/hadoop-hdfs-project/hadoop-hdfs/CHANGES.HDFS-3077.txt
 Mon Aug 20 23:44:14 2012
@@ -26,3 +26,5 @@ HDFS-3799. QJM: handle empty log segment
 HDFS-3797. QJM: add segment txid as a parameter to journal() RPC (todd)
 
 HDFS-3800. improvements to QJM fault testing (todd)
+
+HDFS-3823. QJM: TestQJMWithFaults fails occasionally because of missed setting 
of HTTP port. (todd and atm)

Modified: 
hadoop/common/branches/HDFS-3077/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java?rev=1375323&r1=1375322&r2=1375323&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-3077/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java
 (original)
+++ 
hadoop/common/branches/HDFS-3077/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/client/IPCLoggerChannel.java
 Mon Aug 20 23:44:14 2012
@@ -359,6 +359,11 @@ public class IPCLoggerChannel implements
     return executor.submit(new Callable<PrepareRecoveryResponseProto>() {
       @Override
       public PrepareRecoveryResponseProto call() throws IOException {
+        if (httpPort < 0) {
+          // If the HTTP port hasn't been set yet, force an RPC call so we know
+          // what the HTTP port should be.
+          httpPort = getProxy().getJournalState(journalId).getHttpPort();
+        }
         return getProxy().prepareRecovery(createReqInfo(), segmentTxId);
       }
     });