A13 Fixes to Kafka

blockchainfellow · Jul 19, 2018 · f6df53a · f6df53a
1 parent 37dc65a
commit f6df53a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 52 deletions.
diff --git a/composer/docker-compose.yml b/composer/docker-compose.yml
@@ -35,7 +35,7 @@ services:
       - ORDERER_KAFKA_RETRY_SHORTINTERVAL=1s
       - ORDERER_KAFKA_RETRY_SHORTTOTAL=30s
       - ORDERER_KAFKA_VERBOSE=true
-      - CONFIGTX_ORDERER_KAFKA_BROKERS=[kafka0:9092, kafka1:9092, kafka2:9092, kafka3:9092]
+      - CONFIGTX_ORDERER_KAFKA_BROKERS=[{IP-HOST-1}:9092, {IP-HOST-1}:10092]
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric
     command: orderer
     ports:
@@ -199,7 +199,7 @@ services:
       - KAFKA_LOG_RETENTION_MS=-1
       - KAFKA_ZOOKEEPER_CONNECT={IP-HOST-1}:2181,{IP-HOST-1}:3181,{IP-HOST-1}:4181
     ports:
-      - 9092
+      - 9092:9092
     depends_on:
       - zookeeper0
       - zookeeper1
@@ -220,49 +220,7 @@ services:
       - KAFKA_LOG_RETENTION_MS=-1
       - KAFKA_ZOOKEEPER_CONNECT={IP-HOST-1}:2181,{IP-HOST-1}:3181,{IP-HOST-1}:4181
     ports:
-      - 9092
-    depends_on:
-      - zookeeper0
-      - zookeeper1
-      - zookeeper2
-
-  kafka2:
-    container_name: kafka2
-    # image: wurstmeister/kafka:latest
-    image: hyperledger/fabric-kafka
-    restart: always
-    environment:
-      - KAFKA_MESSAGE_MAX_BYTES=103809024
-      - KAFKA_REPLICA_FETCH_MAX_BYTES=103809024
-      - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false
-      - KAFKA_BROKER_ID=2
-      - KAFKA_MIN_INSYNC_REPLICAS=2
-      - KAFKA_DEFAULT_REPLICATION_FACTOR=3
-      - KAFKA_LOG_RETENTION_MS=-1
-      - KAFKA_ZOOKEEPER_CONNECT={IP-HOST-1}:2181,{IP-HOST-1}:3181,{IP-HOST-1}:4181
-    ports:
-      - 9092
-    depends_on:
-      - zookeeper0
-      - zookeeper1
-      - zookeeper2
-
-  kafka3:
-    container_name: kafka3
-    # image: wurstmeister/kafka:latest
-    image: hyperledger/fabric-kafka
-    restart: always
-    environment:
-      - KAFKA_MESSAGE_MAX_BYTES=103809024
-      - KAFKA_REPLICA_FETCH_MAX_BYTES=103809024 
-      - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false
-      - KAFKA_BROKER_ID=3
-      - KAFKA_MIN_INSYNC_REPLICAS=2
-      - KAFKA_DEFAULT_REPLICATION_FACTOR=3
-      - KAFKA_LOG_RETENTION_MS=-1
-      - KAFKA_ZOOKEEPER_CONNECT={IP-HOST-1}:2181,{IP-HOST-1}:3181,{IP-HOST-1}:4181
-    ports:
-      - 9092
+      - 10092:9092
     depends_on:
       - zookeeper0
       - zookeeper1

diff --git a/config-all/configtx.py b/config-all/configtx.py
@@ -57,10 +57,8 @@
         PreferredMaxBytes: 512 KB
     Kafka:
         Brokers:
-            - kafka0:9092
-            - kafka1:9092
-            - kafka2:9092
-            - kafka3:9092
+            - {IP-HOST-1}:9092
+            - {IP-HOST-1}:10092
     Organizations:
 
 Application: &ApplicationDefaults

diff --git a/config-all/docker-compose-peer-n.py b/config-all/docker-compose-peer-n.py
@@ -27,7 +27,7 @@
       - ORDERER_KAFKA_RETRY_SHORTINTERVAL=1s
       - ORDERER_KAFKA_RETRY_SHORTTOTAL=30s
       - ORDERER_KAFKA_VERBOSE=true
-      - CONFIGTX_ORDERER_KAFKA_BROKERS=[kafka0:9092, kafka1:9092]
+      - CONFIGTX_ORDERER_KAFKA_BROKERS=[{IP-HOST-1}:9092, {IP-HOST-1}:10092, kafka0:9092, kafka1:9092]
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric
     command: orderer
     ports:

diff --git a/config-all/howtobuild.py b/config-all/howtobuild.py
@@ -7,6 +7,7 @@
 HOSTS = ""
 CONFIGTX = ""
 CRYPTOCONFIG  = ""
+PEERNUMBER = ""
 PEERADMINCARD = ""
 arg1 -= 1
 for i in range(arg1):
@@ -18,6 +19,9 @@
 for i in range(arg1):
     CRYPTOCONFIG += 'sed -i -e "s/{IP-HOST-' + str(i+2) + '}/$HOST' + str(i+2) + '/g" crypto-config.yaml\n'
 
+for i in range(arg1):
+    PEERNUMBER += 'sed -i -e "s/{IP-HOST-1}/$HOST1/g" docker-compose-peer' + str(i+2) + '.yaml\n'
+
 for i in range(arg1):
     PEERADMINCARD += 'sed -i -e "s/{IP-HOST-' + str(i+2) + '}/$HOST' + str(i+2) + '/g" ../createPeerAdminCard.sh\n'
 
@@ -30,7 +34,7 @@
 sed -i -e "s/{IP-HOST-1}/$HOST1/g" crypto-config.yaml
 """ + CRYPTOCONFIG + """
 sed -i -e "s/{IP-HOST-1}/$HOST1/g" docker-compose.yml
-sed -i -e "s/{IP-HOST-1}/$HOST1/g" docker-compose-peer2.yml
+""" + PEERNUMBER + """
 sed -i -e "s/{IP-HOST-1}/$HOST1/g" ../createPeerAdminCard.sh
 """ + PEERADMINCARD + """
 

diff --git a/config-all/howtorevert.py b/config-all/howtorevert.py
@@ -7,6 +7,7 @@
 HOSTS = ""
 CONFIGTX = ""
 CRYPTOCONFIG  = ""
+PEERNUMBER = ""
 PEERADMINCARD = ""
 arg1 -= 1
 for i in range(arg1):
@@ -18,6 +19,9 @@
 for i in range(arg1):
     CRYPTOCONFIG += 'sed -i -e "s/$HOST' + str(i+2) + '/{IP-HOST-' + str(i+2) + '}/g" crypto-config.yaml\n'
 
+for i in range(arg1):
+    PEERNUMBER += 'sed -i -e "s/$HOST1/{IP-HOST-1}/g" docker-compose-peer' + str(i+2) + '.yaml\n'
+
 for i in range(arg1):
     PEERADMINCARD += 'sed -i -e "s/$HOST' + str(i+2) + '/{IP-HOST-' + str(i+2) + '}/g" ../createPeerAdminCard.sh\n'
 
@@ -30,7 +34,7 @@
 sed -i -e "s/$HOST1/{IP-HOST-1}/g" crypto-config.yaml
 """ + CRYPTOCONFIG + """
 sed -i -e "s/$HOST1/{IP-HOST-1}/g" docker-compose.yml
-sed -i -e "s/$HOST1/{IP-HOST-1}/g" docker-compose-peer2.yml
+""" + PEERNUMBER + """
 sed -i -e "s/$HOST1/{IP-HOST-1}/g" ../createPeerAdminCard.sh
 """ + PEERADMINCARD + """