[FAB-1659] Update BDD Compose ENV vars

https://jira.hyperledger.org/browse/FAB-1659 In FAB-1612 [1] new configuration keys were introduced on the `orderer.yaml` file. The ENV vars on the Compose files we use for the orderer-related BDD tests however were not updated accordingly. As a result, all tests would run against the default config setting (read: solo) and the Kafka path would not get tested. This changeset addresses this issue. Additionally it: 1. Removes all environment variables from the Compose files when these match the defaults in `orderer.yaml`. This reverses an earlier take on the matter. The thinking behind this change is that we don't need to keep two sets of settings unless absolutely necessary. 2. Formats `orderer.yaml` so that the recently-added lines break at 80 characters, as is the case with the rest of that file. [1] https://gerrit.hyperledger.org/r/#/c/3879/ Change-Id: I0d1e137bd4a8e523edb7cb6a060c09ff80d31340 Signed-off-by: Kostas Christidis <[email protected]>
hyperledger · Jan 15, 2017 · ba288e1 · ba288e1
1 parent ac48017
commit ba288e1
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 49 deletions.
diff --git a/bddtests/docker-compose-orderer-base.yml b/bddtests/docker-compose-orderer-base.yml
@@ -5,15 +5,9 @@ services:
     ordererBase:
         image: hyperledger/fabric-orderer
         environment:
-            - ORDERER_GENERAL_LEDGERTYPE=ram
-            - ORDERER_GENERAL_BATCHTIMEOUT=10s
-            - ORDERER_GENERAL_BATCHSIZE_MAXMESSAGECOUNT=10
-            - ORDERER_GENERAL_MAXWINDOWSIZE=1000
             - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
             - ORDERER_GENERAL_LOGLEVEL=debug
-            - ORDERER_GENERAL_GENESISMETHOD=provisional
-            - ORDERER_GENERAL_GENESISIFILE=${ORDERER_GENERAL_GENESISIFILE}
-            - ORDERER_RAMLEDGER_HISTORY_SIZE=100
+            - ORDERER_GENERAL_GENESISFILE=${ORDERER_GENERAL_GENESISFILE}
         volumes:
             - ./volumes/orderer:/var/hyperledger/bddtests/volumes/orderer
         working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer

diff --git a/bddtests/docker-compose-orderer-kafka.yml b/bddtests/docker-compose-orderer-kafka.yml
@@ -8,8 +8,8 @@ orderer0:
         file: docker-compose-orderer-base.yml
         service: ordererBase
     environment:
-        - ORDERER_GENERAL_ORDERERTYPE=kafka
-        - ORDERER_KAFKA_BROKERS=[kafka0:9092]
+      - ORDERER_GENESIS_ORDERERTYPE=kafka
+      - ORDERER_KAFKA_BROKERS=[kafka0:9092]
     links:
         - kafka0
     command: orderer
diff --git a/bddtests/docker-compose-orderer-solo.yml b/bddtests/docker-compose-orderer-solo.yml
@@ -7,4 +7,4 @@ services:
             file: docker-compose-orderer-base.yml
             service: ordererBase
         environment:
-            - ORDERER_GENERAL_ORDERERTYPE=solo
+            - ORDERER_GENESIS_ORDERERTYPE=solo
diff --git a/bddtests/environments/orderer-1-kafka-1/docker-compose.yml b/bddtests/environments/orderer-1-kafka-1/docker-compose.yml
@@ -7,19 +7,11 @@ services:
   orderer0:
     image: hyperledger/fabric-orderer
     environment:
-        - ORDERER_GENERAL_ORDERERTYPE=kafka
-        - ORDERER_GENERAL_LEDGERTYPE=ram
-        - ORDERER_GENERAL_BATCHTIMEOUT=10s
-        - ORDERER_GENERAL_BATCHSIZE_MAXMESSAGECOUNT=10
-        - ORDERER_GENERAL_QUEUESIZE=1000
-        - ORDERER_GENERAL_MAXWINDOWSIZE=1000
-        - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
-        - ORDERER_GENERAL_LISTENPORT=7050
-        - ORDERER_GENERAL_GENESISMETHOD=provisional
-        - ORDERER_RAMLEDGER_HISTORY_SIZE=100
-        - ORDERER_KAFKA_BROKERS=[kafka0:9092]
+      - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
+      - ORDERER_GENESIS_ORDERERTYPE=kafka
+      - ORDERER_KAFKA_BROKERS=[kafka0:9092]
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
-    command: orderer -loglevel debug -verbose true
+    command: orderer
     ports:
       - '7050'
     depends_on:

diff --git a/bddtests/environments/orderer-1-kafka-3/docker-compose.yml b/bddtests/environments/orderer-1-kafka-3/docker-compose.yml
@@ -7,19 +7,11 @@ services:
   orderer0:
     image: hyperledger/fabric-orderer
     environment:
-      - ORDERER_GENERAL_ORDERERTYPE=kafka
-      - ORDERER_GENERAL_LEDGERTYPE=ram
-      - ORDERER_GENERAL_BATCHTIMEOUT=10s
-      - ORDERER_GENERAL_BATCHSIZE_MAXMESSAGECOUNT=10
-      - ORDERER_GENERAL_QUEUESIZE=1000
-      - ORDERER_GENERAL_MAXWINDOWSIZE=1000
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
-      - ORDERER_GENERAL_LISTENPORT=7050
-      - ORDERER_GENERAL_GENESISMETHOD=provisional
-      - ORDERER_RAMLEDGER_HISTORY_SIZE=100
+      - ORDERER_GENESIS_ORDERERTYPE=kafka
       - ORDERER_KAFKA_BROKERS=[kafka0:9092,kafka1:9092,kafka2:9092]
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
-    command: orderer -loglevel debug -verbose true
+    command: orderer
     ports:
       - '7050'
     depends_on:

diff --git a/bddtests/environments/orderer-n-kafka-n/docker-compose.yml b/bddtests/environments/orderer-n-kafka-n/docker-compose.yml
@@ -7,16 +7,9 @@ services:
   orderer:
     build: ./orderer
     environment:
-      - ORDERER_GENERAL_ORDERERTYPE=kafka
-      - ORDERER_GENERAL_LEDGERTYPE=ram
-      - ORDERER_GENERAL_BATCHTIMEOUT=10s
-      - ORDERER_GENERAL_BATCHSIZE_MAXMESSAGECOUNT=10
       - ORDERER_GENERAL_QUEUESIZE=1000
-      - ORDERER_GENERAL_MAXWINDOWSIZE=1000
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
-      - ORDERER_GENERAL_LISTENPORT=7050
-      - ORDERER_GENERAL_GENESISMETHOD=provisional
-      - ORDERER_RAMLEDGER_HISTORY_SIZE=100
+      - ORDERER_GENESIS_ORDERERTYPE=kafka
     ports:
       - '7050'
     depends_on:

diff --git a/bddtests/steps/bootstrap_util.py b/bddtests/steps/bootstrap_util.py
@@ -428,7 +428,7 @@ def decomposing(self, composition, context):
         shutil.rmtree(self.getVolumePath(composition))
 
     def getEnv(self, composition, context, env):
-        env["ORDERER_GENERAL_GENESISIFILE"]=self.getGenesisFilePath(composition, pathType=PathType.Container)
+        env["ORDERER_GENERAL_GENESISFILE"]=self.getGenesisFilePath(composition, pathType=PathType.Container)
 
 
 class PeerCompositionCallback(compose.CompositionCallback):
@@ -494,6 +494,3 @@ def getEnv(self, composition, context, env):
 
 def setOrdererBootstrapGenesisBlock(genesisBlock):
     'Responsible for setting the GensisBlock for the Orderer nodes upon composition'
-
-
-
diff --git a/orderer/orderer.yaml b/orderer/orderer.yaml
@@ -31,15 +31,18 @@ General:
     # per fabric/docs/Setup/logging-control.md
     LogLevel: info
 
-    # Genesis method: The method by which to retrieve/generate the genesis block. Available values are "provisional", "file"
-    # Provisional utilizes the parameters in the Genesis section to dynamically generate a new genesis block
-    # File uses the fil provided by GenesisFile as the genesis block
+    # Genesis method: The method by which to retrieve/generate the genesis
+    # block. Available values are "provisional", "file". Provisional utilizes
+    # the parameters in the Genesis section to dynamically generate a new
+    # genesis block. File uses the file provided by GenesisFile as the genesis
+    # block.
     GenesisMethod: provisional
 
-    # Genesis file: The file containing the genesis block. Used by the orderer when GenesisMethod is set to "file"
+    # Genesis file: The file containing the genesis block. Used by the orderer
+    # when GenesisMethod is set to "file".
     GenesisFile: ./genesisblock
 
-    # Enable an HTTP service for Go "pprof" profiling as documented at
+    # Enable an HTTP service for Go "pprof" profiling as documented at:
     # https://golang.org/pkg/net/http/pprof
     Profile:
         Enabled: false