BTS-1845 Revert changes for hasAgent field type (#412)

Author: jwierzbo

service/peer.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2017-2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2017-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -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
 	HasResilientSingleFlag bool  `json:"HasResilientSingle,omitempty"` // If set, this peer is running a resilient single server
@@ -61,12 +61,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,
 		HasResilientSingleFlag: boolFromRef(bsCfg.StartResilientSingle, mode.IsActiveFailoverMode()),
@@ -89,7 +85,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 }

service/service.go

@@ -914,7 +914,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)
 					peer.HasResilientSingleFlag = boolFromRef(req.ResilientSingle, peer.HasResilientSingleFlag)
@@ -932,17 +932,16 @@ 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,
 				HasResilientSingleFlag: s.mode.IsActiveFailoverMode(),
 				HasSyncMasterFlag:      s.mode.SupportsArangoSync() && s.cfg.SyncEnabled,
 				HasSyncWorkerFlag:      s.mode.SupportsArangoSync() && s.cfg.SyncEnabled,
 			}
 			if req.Agent != nil {
-				servers.HasAgentFlag = req.Agent
+				servers.HasAgentFlag = *req.Agent
 			}
 			if req.DBServer != nil && *req.DBServer != true {
 				servers.HasDBServerFlag = req.DBServer