ORDERER_GENERAL_BATCHSIZE_MAXMESSAGECOUNT (FAB-1241)

This is needed due to the change introduced by (FAB-1241), otherwise the orderer container won't start properly

Change-Id: Iaf20efef951c1fd13e4259bed9e5e54f07eb2e55
Signed-off-by: kenzhang <[email protected]>

Author: labxnow

bddtests/docker-compose-orderer-base.yml

@@ -7,7 +7,7 @@ services:
         environment:
             - ORDERER_GENERAL_LEDGERTYPE=ram
             - ORDERER_GENERAL_BATCHTIMEOUT=10s
-            - ORDERER_GENERAL_BATCHSIZE=10
+            - ORDERER_GENERAL_BATCHSIZE_MAXMESSAGECOUNT=10
             - ORDERER_GENERAL_MAXWINDOWSIZE=1000
             - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
             - ORDERER_GENERAL_GENESISIFILE=${ORDERER_GENERAL_GENESISIFILE}

bddtests/docker-compose-with-orderer.yml

@@ -8,7 +8,7 @@ services:
     environment:
       - ORDERER_GENERAL_LEDGERTYPE=ram
       - ORDERER_GENERAL_BATCHTIMEOUT=10s
-      - ORDERER_GENERAL_BATCHSIZE=2
+      - ORDERER_GENERAL_BATCHSIZE_MAXMESSAGECOUNT=2
       - ORDERER_GENERAL_MAXWINDOWSIZE=1000
       - ORDERER_GENERAL_ORDERERTYPE=solo
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0

bddtests/environments/orderer-1-kafka-1/docker-compose.yml

@@ -10,7 +10,7 @@ services:
         - ORDERER_GENERAL_ORDERERTYPE=kafka
         - ORDERER_GENERAL_LEDGERTYPE=ram
         - ORDERER_GENERAL_BATCHTIMEOUT=10s
-        - ORDERER_GENERAL_BATCHSIZE=10
+        - ORDERER_GENERAL_BATCHSIZE_MAXMESSAGECOUNT=10
         - ORDERER_GENERAL_QUEUESIZE=1000
         - ORDERER_GENERAL_MAXWINDOWSIZE=1000
         - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0

bddtests/environments/orderer-1-kafka-3/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - ORDERER_GENERAL_ORDERERTYPE=kafka
       - ORDERER_GENERAL_LEDGERTYPE=ram
       - ORDERER_GENERAL_BATCHTIMEOUT=10s
-      - ORDERER_GENERAL_BATCHSIZE=10
+      - ORDERER_GENERAL_BATCHSIZE_MAXMESSAGECOUNT=10
       - ORDERER_GENERAL_QUEUESIZE=1000
       - ORDERER_GENERAL_MAXWINDOWSIZE=1000
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0

bddtests/environments/orderer-n-kafka-n/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - ORDERER_GENERAL_ORDERERTYPE=kafka
       - ORDERER_GENERAL_LEDGERTYPE=ram
       - ORDERER_GENERAL_BATCHTIMEOUT=10s
-      - ORDERER_GENERAL_BATCHSIZE=10
+      - ORDERER_GENERAL_BATCHSIZE_MAXMESSAGECOUNT=10
       - ORDERER_GENERAL_QUEUESIZE=1000
       - ORDERER_GENERAL_MAXWINDOWSIZE=1000
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0

test/docker-compose.yml

@@ -3,7 +3,7 @@ orderer:
   environment:
     - ORDERER_GENERAL_LEDGERTYPE=ram
     - ORDERER_GENERAL_BATCHTIMEOUT=10s
-    - ORDERER_GENERAL_BATCHSIZE=10
+    - ORDERER_GENERAL_BATCHSIZE_MAXMESSAGECOUNT=10
     - ORDERER_GENERAL_MAXWINDOWSIZE=1000
     - ORDERER_GENERAL_ORDERERTYPE=solo
     - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0