Revert [FAB-6096]

This reverts commit e09a94c.

Reason for revert: Accidentally merged own commit

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

Author: kchristidis

orderer/common/performance/utils.go

@@ -46,7 +46,7 @@ func init() {
 	msp := mspmgmt.GetLocalMSP()
 	signer, err = msp.GetDefaultSigningIdentity()
 	if err != nil {
-		panic(fmt.Errorf("Failed to get default signer: %s", err))
+		panic(fmt.Errorf("Failed to initialize get default signer: %s", err))
 	}
 }
 

orderer/common/server/benchmark_test.go

@@ -17,6 +17,7 @@ import (
 	"time"
 
 	"github.com/hyperledger/fabric/common/tools/configtxgen/localconfig"
+	"github.com/hyperledger/fabric/common/tools/configtxgen/provisional"
 	"github.com/hyperledger/fabric/orderer/common/localconfig"
 	perf "github.com/hyperledger/fabric/orderer/common/performance"
 	cb "github.com/hyperledger/fabric/protos/common"
@@ -25,10 +26,10 @@ import (
 
 // Usage: BENCHMARK=true go test -run=TestOrdererBenchmark[Solo|Kafka][Broadcast|Deliver]
 //
-// Benchmark test makes [ch] channels, creates [bc] clients per client per channel per
-// orderer. There are [ord] orderer instances in total. A client ONLY interacts with ONE
-// channel and ONE  orderer, so the number of client in total is [ch * bc * ord]. Note that
-// all clients execute concurrently.
+// Benchmark test makes [ch] channels, creates [bc] clients per client per orderer. There are
+// [ord] orderer instances in total. A client ONLY interacts with ONE channel and ONE
+// orderer, so the number of client in total is [ch * bc * ord]. Note that all clients are
+// concurrent.
 //
 // The test sends [tx] transactions of size [kb] in total. These tx are evenly distributed
 // among all clients, which gives us [tx / (ch * bc * ord)] tx per client.
@@ -55,7 +56,7 @@ import (
 // ordered. This is important for evaluating elapsed time of async broadcast operations.
 //
 // Again, each deliver client only interacts with one channel and one orderer, which
-// results in [ch * dc * ord] deliver clients in total.
+// results in [a * f * e] deliver clients in total.
 //
 // ch  -> channelCounts
 // bc  -> broadcastClientPerChannel
@@ -69,10 +70,8 @@ import (
 // as deliver is effectively retrieving pre-generated blocks, so it shouldn't be choked
 // by slower broadcast.
 //
-// Note: At least three Kafka brokers listening on localhost:[9092-9094] are required to
-// run the  Kafka-based benchmark. This is set in the `envvars` map and can be adjusted
-// if need be.
-// TODO Spin up ephemeral Kafka containers for test
+// Note: a Kafka broker listening on localhost:9092 is required to run Kafka based benchmark
+// TODO(jay_guo) use ephemeral kafka container for test
 
 const (
 	MaxMessageCount = 10
@@ -88,11 +87,10 @@ var envvars = map[string]string{
 	"ORDERER_GENERAL_GENESISPROFILE":                            localconfig.SampleDevModeSoloProfile,
 	"ORDERER_GENERAL_LEDGERTYPE":                                "file",
 	"ORDERER_GENERAL_LOGLEVEL":                                  "error",
-	"ORDERER_KAFKA_VERBOSE":                                     "false",
 	localconfig.Prefix + "_ORDERER_BATCHSIZE_MAXMESSAGECOUNT":   strconv.Itoa(MaxMessageCount),
 	localconfig.Prefix + "_ORDERER_BATCHSIZE_ABSOLUTEMAXBYTES":  strconv.Itoa(AbsoluteMaxBytes) + " KB",
 	localconfig.Prefix + "_ORDERER_BATCHSIZE_PREFERREDMAXBYTES": strconv.Itoa(PreferredMaxBytes) + " KB",
-	localconfig.Prefix + "_ORDERER_KAFKA_BROKERS":               "[localhost:9092, localhost:9093, localhost:9094]",
+	localconfig.Prefix + "_ORDERER_KAFKA_BROKERS":               "[localhost:9092]",
 }
 
 type factors struct {
@@ -121,13 +119,16 @@ func (f factors) String() string {
 // As benchmark tests are skipped by default, we put this test here to catch
 // potential code changes that might break benchmark tests. If this test fails,
 // it is likely that benchmark tests need to be updated.
-func TestOrdererBenchmarkSolo(t *testing.T) {
+func TestOrdererBenchmark(t *testing.T) {
+	os.Setenv(localconfig.Prefix+"_ORDERER_ORDERERTYPE", provisional.ConsensusTypeSolo)
+	defer os.Unsetenv(localconfig.Prefix + "_ORDERER_ORDERERTYPE")
+
 	for key, value := range envvars {
 		os.Setenv(key, value)
 		defer os.Unsetenv(key)
 	}
 
-	t.Run("Benchmark Sample Test (Solo)", func(t *testing.T) {
+	t.Run("Benchmark Sample Test", func(t *testing.T) {
 		benchmarkOrderer(t, 1, 5, PreferredMaxBytes, 1, 0, 1, true)
 	})
 }
@@ -138,6 +139,9 @@ func TestOrdererBenchmarkSoloBroadcast(t *testing.T) {
 		t.Skip("Skipping benchmark test")
 	}
 
+	os.Setenv(localconfig.Prefix+"_ORDERER_ORDERERTYPE", provisional.ConsensusTypeSolo)
+	defer os.Unsetenv(localconfig.Prefix + "_ORDERER_ORDERERTYPE")
+
 	for key, value := range envvars {
 		os.Setenv(key, value)
 		defer os.Unsetenv(key)
@@ -183,6 +187,9 @@ func TestOrdererBenchmarkSoloDeliver(t *testing.T) {
 		t.Skip("Skipping benchmark test")
 	}
 
+	os.Setenv(localconfig.Prefix+"_ORDERER_ORDERERTYPE", provisional.ConsensusTypeSolo)
+	defer os.Unsetenv(localconfig.Prefix + "_ORDERER_ORDERERTYPE")
+
 	for key, value := range envvars {
 		os.Setenv(key, value)
 		defer os.Unsetenv(key)
@@ -228,14 +235,14 @@ func TestOrdererBenchmarkKafkaBroadcast(t *testing.T) {
 		t.Skip("Skipping benchmark test")
 	}
 
+	os.Setenv(localconfig.Prefix+"_ORDERER_ORDERERTYPE", provisional.ConsensusTypeKafka)
+	defer os.Unsetenv(localconfig.Prefix + "_ORDERER_ORDERERTYPE")
+
 	for key, value := range envvars {
 		os.Setenv(key, value)
 		defer os.Unsetenv(key)
 	}
 
-	os.Setenv("ORDERER_GENERAL_GENESISPROFILE", localconfig.SampleDevModeKafkaProfile)
-	defer os.Unsetenv("ORDERER_GENERAL_GENESISPROFILE")
-
 	var (
 		channelCounts             = []int{1, 10}
 		totalTx                   = []int{10000}
@@ -276,14 +283,14 @@ func TestOrdererBenchmarkKafkaDeliver(t *testing.T) {
 		t.Skip("Skipping benchmark test")
 	}
 
+	os.Setenv(localconfig.Prefix+"_ORDERER_ORDERERTYPE", provisional.ConsensusTypeKafka)
+	defer os.Unsetenv(localconfig.Prefix + "_ORDERER_ORDERERTYPE")
+
 	for key, value := range envvars {
 		os.Setenv(key, value)
 		defer os.Unsetenv(key)
 	}
 
-	os.Setenv("ORDERER_GENERAL_GENESISPROFILE", localconfig.SampleDevModeKafkaProfile)
-	defer os.Unsetenv("ORDERER_GENERAL_GENESISPROFILE")
-
 	var (
 		channelCounts             = []int{1, 10}
 		totalTx                   = []int{10000}
@@ -505,16 +512,16 @@ func benchmarkOrderer(
 	// Experiment shows that atomic counter is not bottleneck.
 	assert.Equal(t, uint64(totalTx), txCount, "Expected to send %d msg, but actually sent %d", uint64(totalTx), txCount)
 
-	ordererProfile := os.Getenv("ORDERER_GENERAL_GENESISPROFILE")
+	ordererType := os.Getenv(localconfig.Prefix + "_ORDERER_ORDERERTYPE")
 
 	fmt.Printf(
-		"Messages: %6d  Message Size: %3dKB  Channels: %3d Orderer (%s): %2d | "+
+		"Message: %6d  Message Size: %3dKB  Channels: %3d Orderer(%s): %2d | "+
 			"Broadcast Clients: %3d  Write tps: %5.1f tx/s Elapsed Time: %0.2fs | "+
 			"Deliver clients: %3d  Read tps: %8.1f blk/s Elapsed Time: %0.2fs\n",
 		totalTx,
 		msgSize,
 		numOfChannels,
-		ordererProfile,
+		ordererType,
 		numOfOrderer,
 		broadcastClientPerChannel*numOfChannels*numOfOrderer,
 		float64(totalTx)/btime.Seconds(),