ensure use of new msgpack time format

see https://github.com/hashicorp/go-msgpack/releases/tag/v2.1.0 for details
hashicorp · Mar 20, 2024 · 772d35f · 772d35f
1 parent 354a3fe
commit 772d35f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/helper/raftutil/state.go b/helper/raftutil/state.go
@@ -31,6 +31,7 @@ func RaftStateInfo(p string) (store *raftboltdb.BoltStore, firstIdx uint64, last
 			ReadOnly: true,
 			Timeout:  1 * time.Second,
 		},
+		MsgpackUseNewTimeFormat: true,
 	}
 	s, err := raftboltdb.New(opts)
 	if err != nil {

diff --git a/nomad/config.go b/nomad/config.go
@@ -638,6 +638,9 @@ func DefaultConfig() *Config {
 	c.SerfConfig.MemberlistConfig = memberlist.DefaultWANConfig()
 	c.SerfConfig.MemberlistConfig.BindPort = DefaultSerfPort
 
+	c.SerfConfig.MsgpackUseNewTimeFormat = true
+	c.SerfConfig.MemberlistConfig.MsgpackUseNewTimeFormat = true
+
 	// Disable shutdown on removal
 	c.RaftConfig.ShutdownOnRemove = false
 

diff --git a/nomad/server.go b/nomad/server.go
@@ -1391,8 +1391,19 @@ func (s *Server) setupRaft() error {
 	}
 
 	// Create a transport layer
-	trans := raft.NewNetworkTransport(s.raftLayer, 3, s.config.RaftTimeout,
-		s.config.LogOutput)
+	logger := log.New(&log.LoggerOptions{
+		Name:   "raft-net",
+		Output: s.config.LogOutput,
+		Level:  log.DefaultLevel,
+	})
+	netConfig := &raft.NetworkTransportConfig{
+		Stream:                  s.raftLayer,
+		MaxPool:                 3,
+		Timeout:                 s.config.RaftTimeout,
+		Logger:                  logger,
+		MsgpackUseNewTimeFormat: true,
+	}
+	trans := raft.NewNetworkTransportWithConfig(netConfig)
 	s.raftTransport = trans
 
 	// Make sure we set the Logger.
@@ -1442,6 +1453,7 @@ func (s *Server) setupRaft() error {
 			BoltOptions: &bbolt.Options{
 				NoFreelistSync: s.config.RaftBoltNoFreelistSync,
 			},
+			MsgpackUseNewTimeFormat: true,
 		})
 		if raftErr != nil {
 			return raftErr