FAB-5846 Infinite wait on slow channel update

Change-Id: Id47b57f9283e97171ac10a8d134795b39a75623b
Signed-off-by: rickr <cr22rc@gmail.com>

Author: cr22rc

src/main/java/org/hyperledger/fabric/sdk/Channel.java

@@ -260,6 +260,8 @@ public void updateChannelConfiguration(UpdateChannelConfiguration updateChannelC
 
         try {
             final long startLastConfigIndex = getLastConfigIndex(orderer);
+            logger.trace(format("startLastConfigIndex: %d. Channel config wait time is: %d",
+                    startLastConfigIndex, CHANNEL_CONFIG_WAIT_TIME));
 
             sendUpdateChannel(updateChannelConfiguration.getUpdateChannelConfigurationAsBytes(), signers, orderer);
 
@@ -274,9 +276,10 @@ public void updateChannelConfiguration(UpdateChannelConfiguration updateChannelC
                     final long duration = TimeUnit.MILLISECONDS.convert(System.nanoTime() - nanoTimeStart, TimeUnit.NANOSECONDS);
 
                     if (duration > CHANNEL_CONFIG_WAIT_TIME) {
-                        logger.warn(format("Channel %s did not get updated last config after %d ms", name, duration));
+                        logger.warn(format("Channel %s did not get updated last config after %d ms, Config wait time: %d ms. startLastConfigIndex: %d, currentLastConfigIndex: %d ",
+                                name, duration, CHANNEL_CONFIG_WAIT_TIME, startLastConfigIndex, currentLastConfigIndex));
                         //waited long enough ..
-                        currentLastConfigIndex = startLastConfigIndex; // just bail don't throw exception.
+                        currentLastConfigIndex = startLastConfigIndex - 1L; // just bail don't throw exception.
                     } else {
 
                         try {
@@ -289,6 +292,8 @@ public void updateChannelConfiguration(UpdateChannelConfiguration updateChannelC
 
                 }
 
+                logger.trace(format("currentLastConfigIndex: %d", currentLastConfigIndex));
+
             } while (currentLastConfigIndex == startLastConfigIndex);
 
         } catch (TransactionException e) {
@@ -386,7 +391,6 @@ private void sendUpdateChannel(byte[] configupdate, byte[][] signers, Orderer or
                     String info = trxResult.getInfo();
                     if (null == info) {
                         info = "";
-
                     }
 
                     throw new TransactionException(format("New channel %s error. StatusValue %d. Status %s. %s", name,
@@ -1059,7 +1063,11 @@ private Block getConfigurationBlock() throws TransactionException {
                         channelHeader.getChannelId(), name));
             }
 
-            logger.trace(format("Channel %s getConfigurationBlock returned %s", name, String.valueOf(configBlock)));
+            if (null != diagnosticFileDumper) {
+                logger.trace(format("Channel %s getConfigurationBlock returned %s", name,
+                        diagnosticFileDumper.createDiagnosticFile(String.valueOf(configBlock).getBytes())));
+            }
+
             if (!logger.isTraceEnabled()) {
                 logger.debug(format("Channel %s getConfigurationBlock returned", name));
             }

src/main/java/org/hyperledger/fabric/sdk/helper/Config.java

@@ -100,7 +100,7 @@ private Config() {
             defaultProperty(EXTRALOGLEVEL, "0");
             defaultProperty(LOGGERLEVEL, null);
             defaultProperty(DIAGNOTISTIC_FILE_DIRECTORY, null);
-            defaultProperty(CHANNEL_CONFIG_WAIT_TIME, "10000");
+            defaultProperty(CHANNEL_CONFIG_WAIT_TIME, "15000");
             defaultProperty(ORDERER_RETRY_WAIT_TIME, "200");
             defaultProperty(EVENTHUB_CONNECTION_WAIT_TIME, "1000");