Skip to content

Commit

Permalink
[FAB-2367] Remove unused orderer yaml parameters
Browse files Browse the repository at this point in the history
https://jira.hyperledger.org/browse/FAB-2367

The orderer.yaml file contains a QueueSize and WindowSize parameter
which invites people to tweak these parameters to attempt to optimize
performance.  However, they no longer have any effect on the system and
the only place they are referenced is in the config.

This CR removes them.

Change-Id: Ida695c94d447b93a177786506579830575c49a79
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
  • Loading branch information
Jason Yellick committed Feb 19, 2017
1 parent 5455c58 commit 1405e27
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 18 deletions.
10 changes: 0 additions & 10 deletions orderer/localconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ const Prefix string = "ORDERER"
// General contains config which should be common among all orderer types
type General struct {
LedgerType string
QueueSize uint32
MaxWindowSize uint32
ListenAddress string
ListenPort uint16
TLS TLS
Expand Down Expand Up @@ -145,8 +143,6 @@ type TopLevel struct {
var defaults = TopLevel{
General: General{
LedgerType: "ram",
QueueSize: 1000,
MaxWindowSize: 1000,
ListenAddress: "127.0.0.1",
ListenPort: 7050,
GenesisMethod: "provisional",
Expand Down Expand Up @@ -202,12 +198,6 @@ func (c *TopLevel) completeInitialization() {
case c.General.LedgerType == "":
logger.Infof("General.LedgerType unset, setting to %s", defaults.General.LedgerType)
c.General.LedgerType = defaults.General.LedgerType
case c.General.QueueSize == 0:
logger.Infof("General.QueueSize unset, setting to %s", defaults.General.QueueSize)
c.General.QueueSize = defaults.General.QueueSize
case c.General.MaxWindowSize == 0:
logger.Infof("General.MaxWindowSize unset, setting to %s", defaults.General.MaxWindowSize)
c.General.MaxWindowSize = defaults.General.MaxWindowSize
case c.General.ListenAddress == "":
logger.Infof("General.ListenAddress unset, setting to %s", defaults.General.ListenAddress)
c.General.ListenAddress = defaults.General.ListenAddress
Expand Down
8 changes: 0 additions & 8 deletions orderer/orderer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,6 @@ General:
# Available types are "ram", "file".
LedgerType: ram

# Queue Size: The maximum number of messages to allow pending from a gRPC
# client.
QueueSize: 10

# Max Window Size: The maximum number of messages to for the orderer Deliver
# to allow before acknowledgement must be received from the client.
MaxWindowSize: 1000

# Listen address: The IP on which to bind to listen
ListenAddress: 127.0.0.1

Expand Down

0 comments on commit 1405e27

Please sign in to comment.