From 369c1e1bdf8b5296b7e561ccea70b74ab9234df1 Mon Sep 17 00:00:00 2001 From: kenzhang Date: Thu, 22 Dec 2016 16:01:10 -0500 Subject: [PATCH] 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 --- bddtests/docker-compose-orderer-base.yml | 2 +- bddtests/docker-compose-with-orderer.yml | 2 +- bddtests/environments/orderer-1-kafka-1/docker-compose.yml | 2 +- bddtests/environments/orderer-1-kafka-3/docker-compose.yml | 2 +- bddtests/environments/orderer-n-kafka-n/docker-compose.yml | 2 +- test/docker-compose.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bddtests/docker-compose-orderer-base.yml b/bddtests/docker-compose-orderer-base.yml index 2764c3d8bbd..3502a30366c 100644 --- a/bddtests/docker-compose-orderer-base.yml +++ b/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} diff --git a/bddtests/docker-compose-with-orderer.yml b/bddtests/docker-compose-with-orderer.yml index 6876924ba50..2556e5265a3 100644 --- a/bddtests/docker-compose-with-orderer.yml +++ b/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 diff --git a/bddtests/environments/orderer-1-kafka-1/docker-compose.yml b/bddtests/environments/orderer-1-kafka-1/docker-compose.yml index 78d158452a6..48f84234e58 100644 --- a/bddtests/environments/orderer-1-kafka-1/docker-compose.yml +++ b/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 diff --git a/bddtests/environments/orderer-1-kafka-3/docker-compose.yml b/bddtests/environments/orderer-1-kafka-3/docker-compose.yml index 8234189b39e..eece9dc4150 100644 --- a/bddtests/environments/orderer-1-kafka-3/docker-compose.yml +++ b/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 diff --git a/bddtests/environments/orderer-n-kafka-n/docker-compose.yml b/bddtests/environments/orderer-n-kafka-n/docker-compose.yml index 47c8f1fcc59..2e6865c068f 100644 --- a/bddtests/environments/orderer-n-kafka-n/docker-compose.yml +++ b/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 diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 55b223705a8..53620368fae 100644 --- a/test/docker-compose.yml +++ b/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