[FAB-4083] Fix filesize-related defaults for orderer

The `Producer.MaxMessageBytes` default we were setting on the Kafka
producers was incorrectly set to Kafka's default value for
`socket.request.max.bytes`. (I actually set it to a value that was just
a byte shorter than this when I pushed in the refactor changeset a few
days ago in order to silence the sarama logs, and added a FIXME note for
this very reason.) This value is incorrect because it doesn't account
for headers. This changeset assumes a too-generous 1MB for headers and
decreates `Producer.MaxMessageBytes` accordingly.

This changeset also updates the default value for AbsoluteMaxBytes in
`configtx.yaml`. The current value is incorrect because it doesn't
account for the wrapping of messages in the container `KafkaRegular`
format. At a minimum, it should be decreased compared to
`Producer.MaxMessageBytes` by an equal padding. This changeset does this
for all `configtx.yaml` files currently in our codebase.

Finally, it sets the default, suggested value for AbsoluteMaxBytes in
the sampleconfig `configtx.yaml` file to a much more reasonable 10 MiB,
well within the constraints we outlined above. The default check in
`localconfig` has been updated accordingly.

See the JIRA item for a detailed explanation of the issue.

Change-Id: I8821982707282c5069c1a66dd2a121b894b3a3c8
Signed-off-by: Kostas Christidis <[email protected]>

Author: kchristidis

bddtests/dc-orderer-kafka-base.yml

@@ -25,9 +25,8 @@ services:
       #
       # socket.request.max.bytes
       # The maximum number of bytes in a socket request. ATTN: If you set this
-      # env var, you should make sure that the value assigned to
-      # `brokerConfig.Producer.MaxMessageBytes` in `newBrokerConfig()` in
-      # `fabric/orderer/kafka/util.go` matches it.
+      # env var, make sure to update `brokerConfig.Producer.MaxMessageBytes` in
+      # `newBrokerConfig()` in `fabric/orderer/kafka/config.go` accordingly.
       #- KAFKA_SOCKET_REQUEST_MAX_BYTES=104857600 # 100 * 1024 * 1024 B
       #
       # message.max.bytes

common/configtx/tool/localconfig/config.go

@@ -154,7 +154,7 @@ var genesisDefaults = TopLevel{
 		BatchTimeout: 2 * time.Second,
 		BatchSize: BatchSize{
 			MaxMessageCount:   10,
-			AbsoluteMaxBytes:  100000000,
+			AbsoluteMaxBytes:  10 * 1024 * 1024,
 			PreferredMaxBytes: 512 * 1024,
 		},
 		Kafka: Kafka{

examples/cluster/config/configtx.yaml

@@ -103,7 +103,7 @@ Orderer: &OrdererDefaults
 
         # Absolute Max Bytes: The absolute maximum number of bytes allowed for
         # the serialized messages in a batch.
-        AbsoluteMaxBytes: 99 MB
+        AbsoluteMaxBytes: 98 MB
 
         # Preferred Max Bytes: The preferred maximum number of bytes allowed for
         # the serialized messages in a batch. A message larger than the preferred

examples/e2e_cli/configtx.yaml

@@ -117,7 +117,7 @@ Orderer: &OrdererDefaults
 
         # Absolute Max Bytes: The absolute maximum number of bytes allowed for
         # the serialized messages in a batch.
-        AbsoluteMaxBytes: 99 MB
+        AbsoluteMaxBytes: 98 MB
 
         # Preferred Max Bytes: The preferred maximum number of bytes allowed for
         # the serialized messages in a batch. A message larger than the preferred

orderer/kafka/config.go

@@ -15,15 +15,14 @@ import (
 )
 
 func newBrokerConfig(tlsConfig localconfig.TLS, retryOptions localconfig.Retry, kafkaVersion sarama.KafkaVersion, chosenStaticPartition int32) *sarama.Config {
-	brokerConfig := sarama.NewConfig()
+	// Max. size for request headers, etc. Set in bytes. Too big on purpose.
+	paddingDelta := 1 * 1024 * 1024
 
-	// FIXME https://jira.hyperledger.org/browse/FAB-4136
-	// Use retryOptions to populate `Net`
+	brokerConfig := sarama.NewConfig()
 
 	brokerConfig.Consumer.Retry.Backoff = retryOptions.Consumer.RetryBackoff
 
-	// Allows us to retrieve errors that occur when consuming a channel, via the
-	// channel's `listenForErrors` goroutine.
+	// Allows us to retrieve errors that occur when consuming a channel
 	brokerConfig.Consumer.Return.Errors = true
 
 	brokerConfig.Metadata.Retry.Backoff = retryOptions.Metadata.RetryBackoff
@@ -57,7 +56,7 @@ func newBrokerConfig(tlsConfig localconfig.TLS, retryOptions localconfig.Retry,
 
 	// Set equivalent of Kafka producer config max.request.bytes to the default
 	// value of a Kafka broker's socket.request.max.bytes property (100 MiB).
-	brokerConfig.Producer.MaxMessageBytes = int(sarama.MaxRequestSize) // FIXME https://jira.hyperledger.org/browse/FAB-4083
+	brokerConfig.Producer.MaxMessageBytes = int(sarama.MaxRequestSize) - paddingDelta
 
 	brokerConfig.Producer.Retry.Backoff = retryOptions.Producer.RetryBackoff
 	brokerConfig.Producer.Retry.Max = retryOptions.Producer.RetryMax

sampleconfig/configtx.yaml

@@ -147,8 +147,8 @@ Orderer: &OrdererDefaults
         # Absolute Max Bytes: The absolute maximum number of bytes allowed for
         # the serialized messages in a batch. If the "kafka" OrdererType is
         # selected, set 'message.max.bytes' and 'replica.fetch.max.bytes' on the
-        # Kafka brokers to a value that is equal to or larger than this one.
-        AbsoluteMaxBytes: 99 MB
+        # Kafka brokers to a value that is larger than this one.
+        AbsoluteMaxBytes: 10 MB
 
         # Preferred Max Bytes: The preferred maximum number of bytes allowed for
         # the serialized messages in a batch. A message larger than the

test/feature/configs/configtx.yaml

@@ -132,8 +132,8 @@ Orderer: &OrdererDefaults
         # Absolute Max Bytes: The absolute maximum number of bytes allowed for
         # the serialized messages in a batch. If the "kafka" OrdererType is
         # selected, set 'message.max.bytes' and 'replica.fetch.max.bytes' on the
-        # Kafka brokers to a value that is equal to or larger than this one.
-        AbsoluteMaxBytes: 99 MB
+        # Kafka brokers to a value that is larger than this one.
+        AbsoluteMaxBytes: 98 MB
 
         # Preferred Max Bytes: The preferred maximum number of bytes allowed for
         # the serialized messages in a batch. A message larger than the