Skip to content

BTS-1845 Revert changes for hasAgent field type #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 18, 2024
Merged

BTS-1845 Revert changes for hasAgent field type #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cc4f70
BTS-1845 Revert changes for hasAgent field type
jwierzbo Apr 18, 2024
338581e
fix
jwierzbo Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions service/peer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (

// peerServers
type peerServers struct {
HasAgentFlag *bool `json:"HasAgent,omitempty"` // If set, this peer is running an agent
HasAgentFlag bool `json:"HasAgent"` // If set, this peer is running an agent
HasDBServerFlag *bool `json:"HasDBServer,omitempty"` // If set or is nil, this peer is running a dbserver
HasCoordinatorFlag *bool `json:"HasCoordinator,omitempty"` // If set or is nil, this peer is running a coordinator
}
Expand All @@ -58,12 +58,8 @@ func preparePeerServers(mode ServiceMode, bsCfg BootstrapConfig, config Config)
if !boolFromRef(bsCfg.StartCoordinator, true) {
hasCoordinator = boolRef(false)
}
var hasAgent *bool
if !boolFromRef(bsCfg.StartAgent, !mode.IsSingleMode()) {
hasAgent = boolRef(false)
}
return peerServers{
HasAgentFlag: hasAgent,
HasAgentFlag: boolFromRef(bsCfg.StartAgent, !mode.IsSingleMode()),
HasDBServerFlag: hasDBServer,
HasCoordinatorFlag: hasCoordinator,
}
Expand All @@ -83,7 +79,7 @@ func newPeer(id, address string, port, portOffset int, dataDir string, servers p
}

// HasAgent returns true if this peer is running an agent
func (p Peer) HasAgent() bool { return p.HasAgentFlag == nil || *p.HasAgentFlag }
func (p Peer) HasAgent() bool { return p.HasAgentFlag }

// HasDBServer returns true if this peer is running a dbserver
func (p Peer) HasDBServer() bool { return p.HasDBServerFlag == nil || *p.HasDBServerFlag }
Expand Down
7 changes: 3 additions & 4 deletions service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ func (s *Service) HandleHello(ownAddress, remoteAddress string, req *HelloReques
peer.Port = req.SlavePort
peer.DataDir = req.DataDir

peer.HasAgentFlag = utils.NotNilDefault(req.Agent, peer.HasAgentFlag)
peer.HasAgentFlag = boolFromRef(req.Agent, peer.HasAgentFlag)
peer.HasCoordinatorFlag = utils.NotNilDefault(req.Coordinator, peer.HasCoordinatorFlag)
peer.HasDBServerFlag = utils.NotNilDefault(req.DBServer, peer.HasDBServerFlag)
}
Expand All @@ -831,14 +831,13 @@ func (s *Service) HandleHello(ownAddress, remoteAddress string, req *HelloReques
portOffset := s.myPeers.GetFreePortOffset(slaveAddr, slavePort, s.cfg.AllPortOffsetsUnique)
s.log.Debug().Msgf("Set slave port offset to %d, got slaveAddr=%s, slavePort=%d", portOffset, slaveAddr, slavePort)

hasAgentFlag := !s.myPeers.HaveEnoughAgents()
servers := peerServers{
HasAgentFlag: &hasAgentFlag,
HasAgentFlag: !s.myPeers.HaveEnoughAgents(),
HasDBServerFlag: nil,
HasCoordinatorFlag: nil,
}
if req.Agent != nil {
servers.HasAgentFlag = req.Agent
servers.HasAgentFlag = *req.Agent
}
if req.DBServer != nil && *req.DBServer != true {
servers.HasDBServerFlag = req.DBServer
Expand Down