[FAB-2439] Add sample genesis profile for Kafka

https://jira.hyperledger.org/browse/FAB-2439

This changeset:

1. Introduces a bare-minimum genesis profile for Kafka
2. Updates the Kafka-related Docker environments under `bddtests`

Change-Id: I02c106f181afb38ab2262410baaf05427aa4bb20
Signed-off-by: Kostas Christidis <kostas@christidis.io>

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

@@ -7,8 +7,8 @@ services:
     image: hyperledger/fabric-testenv-orderer
     environment:
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
-      - ORDERER_GENESIS_ORDERERTYPE=kafka
-      - ORDERER_KAFKA_BROKERS=[kafka0:9092]
+      - ORDERER_GENERAL_GENESISPROFILE=SampleInsecureKafka
+      - CONFIGTX_ORDERER_KAFKA_BROKERS=[kafka0:9092]
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
     command: orderer
     ports:

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

@@ -7,8 +7,8 @@ services:
     image: hyperledger/fabric-testenv-orderer
     environment:
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
-      - ORDERER_GENESIS_ORDERERTYPE=kafka
-      - ORDERER_KAFKA_BROKERS=[kafka0:9092,kafka1:9092,kafka2:9092]
+      - ORDERER_GENERAL_GENESISPROFILE=SampleInsecureKafka
+      - CONFIGTX_ORDERER_KAFKA_BROKERS=[kafka0:9092,kafka1:9092,kafka2:9092]
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
     command: orderer
     ports:

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

@@ -6,9 +6,8 @@ services:
   orderer:
     image: hyperledger/fabric-testenv-orderer
     environment:
-      - ORDERER_GENERAL_QUEUESIZE=1000
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
-      - ORDERER_GENESIS_ORDERERTYPE=kafka
+      - ORDERER_GENERAL_GENESISPROFILE=SampleInsecureKafka
     ports:
       - '7050'
     depends_on:

bddtests/environments/orderer/docker-compose.yml

@@ -4,8 +4,6 @@ services:
     build: .
     image: hyperledger/fabric-testenv-orderer
     environment:
-      - ORDERER_GENERAL_QUEUESIZE=1000
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
-      - ORDERER_GENESIS_ORDERERTYPE=solo
     ports:
       - '7050'

bddtests/environments/orderer/docker-entrypoint.sh

@@ -1,49 +1,44 @@
 #!/usr/bin/env bash
 
-# This script will either start the kafka server, or run the user
+# This script will either start the Kafka server, or run the user
 # specified command.
 
-# Exit immediately if a pipeline returns a non-zero status.
+# exit immediately if a pipeline returns a non-zero status
 set -e
 
 ORDERER_EXE=orderer
+KAFKA_GENESIS_PROFILES=(SampleInsecureKafka)
 
 # handle starting the orderer with an option
 if [ "${1:0:1}" = '-' ]; then
   set -- ${ORDERER_EXE} "$@"
 fi
 
-# handle default (i.e. no custom options or commands)
+# check if the Kafka-based orderer is invoked
 if [ "$1" = "${ORDERER_EXE}" ]; then
-
-  case "$ORDERER_GENESIS_ORDERERTYPE" in
-  solo)
-    ;;
-  kafka)
-    # make sure at least one broker has started.
-    # get the broker list from zookeeper
-    if [ -z "$ORDERER_KAFKA_BROKERS" ] ; then
-      if [ -z "$ZOOKEEPER_CONNECT" ] ; then
-        export ZOOKEEPER_CONNECT="zookeeper:2181"
+  for PROFILE in "${KAFKA_GENESIS_PROFILES[@]}"; do
+    if [ "$ORDERER_GENERAL_GENESISPROFILE" == "$PROFILE" ] ; then
+      # make sure at least one broker has started
+      # get the broker list from ZooKeeper
+      if [ -z "$CONFIGTX_ORDERER_KAFKA_BROKERS" ] ; then
+        if [ -z "$ZOOKEEPER_CONNECT" ] ; then
+          export ZOOKEEPER_CONNECT="zookeeper:2181"
+        fi
+        ZK_CLI_EXE="/usr/share/zookeeper/bin/zkCli.sh -server ${ZOOKEEPER_CONNECT}"
+        until [ -n "$($ZK_CLI_EXE ls /brokers/ids | grep '^\[')" ] ; do
+          echo "No Kafka brokers registered in ZooKeeper. Will try again in 1 second."
+          sleep 1
+        done
+        CONFIGTX_ORDERER_KAFKA_BROKERS="["
+        CONFIGTX_ORDERER_KAFKA_BROKERS_SEP=""
+        for BROKER_ID in $($ZK_CLI_EXE ls /brokers/ids | grep '^\[' | sed 's/[][,]/ /g'); do
+          CONFIGTX_ORDERER_KAFKA_BROKERS=${CONFIGTX_ORDERER_KAFKA_BROKERS}${ORDERER_KAFKA_BROKERS_SEP}$($ZK_CLI_EXE get /brokers/ids/$BROKER_ID 2>&1 | grep '^{' | jq -j '. | .host,":",.port')
+          CONFIGTX_ORDERER_KAFKA_BROKERS_SEP=","
+        done
+        export CONFIGTX_ORDERER_KAFKA_BROKERS="${CONFIGTX_ORDERER_KAFKA_BROKERS}]"
       fi
-      ZK_CLI_EXE="/usr/share/zookeeper/bin/zkCli.sh -server ${ZOOKEEPER_CONNECT}"
-      until [ -n "$($ZK_CLI_EXE ls /brokers/ids | grep '^\[')" ] ; do
-        echo "No Kafka brokers registered in ZooKeeper. Will try again in 1 second."
-        sleep 1
-      done
-      ORDERER_KAFKA_BROKERS="["
-      ORDERER_KAFKA_BROKERS_SEP=""
-      for BROKER_ID in $($ZK_CLI_EXE ls /brokers/ids | grep '^\[' | sed 's/[][,]/ /g'); do
-        ORDERER_KAFKA_BROKERS=${ORDERER_KAFKA_BROKERS}${ORDERER_KAFKA_BROKERS_SEP}$($ZK_CLI_EXE get /brokers/ids/$BROKER_ID 2>&1 | grep '^{' | jq -j '. | .host,":",.port')
-        ORDERER_KAFKA_BROKERS_SEP=","
-      done
-      export ORDERER_KAFKA_BROKERS="${ORDERER_KAFKA_BROKERS}]"
     fi
-    ;;
-  sbft)
-    ;;
-  esac
-
+  done
 fi
 
 exec "$@"

common/configtx/tool/configtx.yaml

@@ -9,16 +9,26 @@
 ################################################################################
 Profiles:
 
-    # SampleInsecureSol defines a configuration which contains no MSP definitions
-    # and allows all transactions and channel creation requests
+    # SampleInsecureSolo defines a configuration which uses the Solo orderer,
+    # contains no MSP definitions, and allows all transactions and channel
+    # creation requests
     SampleInsecureSolo:
         Orderer:
             <<: *OrdererDefaults
-        Application: 
+        Application:
+            <<: *ApplicationDefaults
+
+    # SampleInsecureKafka defines a configuration that differs from the
+    # SampleInsecureSolo one only in that is uses the Kafka-based orderer.
+    SampleInsecureKafka:
+        Orderer:
+            <<: *OrdererDefaults
+            OrdererType: kafka
+        Application:
             <<: *ApplicationDefaults
 
-    # SampleSingleMSPSolo defines a configuration which contains a single MSP
-    # definition (the MSP sampleconfig).
+    # SampleSingleMSPSolo defines a configuration which uses the Solo orderer,
+    # and contains a single MSP definition (the MSP sampleconfig).
     SampleSingleMSPSolo:
         Orderer:
             <<: *OrdererDefaults
@@ -102,8 +112,9 @@ Orderer: &OrdererDefaults
         AbsoluteMaxBytes: 99 MB
 
         # Preferred Max Bytes: The preferred maximum number of bytes allowed for
-        # the serialized messages in a batch. A message larger than the preferred
-        # max bytes will result in a batch larger than preferred max bytes.
+        # the serialized messages in a batch. A message larger than the
+        # preferred max bytes will result in a batch larger than preferred max
+        # bytes.
         PreferredMaxBytes: 512 KB
 
     Kafka: