kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 02:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Dev mode should never persist nodeid

Browse Source
This commit is contained in:
Preetha Appan
2018-04-10 12:34:14 -05:00
parent 1ba9feb3b7
commit ffb622fbfd
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
command/agent/agent.go
View File

@@ -448,8 +448,6 @@ func (a *Agent) setupServer() error {
return fmt.Errorf("server config setup failed: %s", err)
}
a.logger.Printf("ALEX: data dir: %q", conf.DataDir)
// Generate a node ID and persist it if it is the first instance, otherwise
// read the persisted node ID.
if err := a.setupNodeID(conf); err != nil {
@@ -533,6 +531,12 @@ func (a *Agent) setupServer() error {
// setupNodeID will pull the persisted node ID, if any, or create a random one
// and persist it.
func (a *Agent) setupNodeID(config *nomad.Config) error {
// For dev mode we have no filesystem access so just make a node ID.
if a.config.DevMode {
config.NodeID = uuid.Generate()
return nil
}
// Load saved state, if any. Since a user could edit this, we also
// validate it. Saved state overwrites any configured node id
fileID := filepath.Join(config.DataDir, "node-id")
@@ -569,12 +573,6 @@ func (a *Agent) setupNodeID(config *nomad.Config) error {
return nil
}
// For dev mode we have no filesystem access so just make one.
if a.config.DevMode {
config.NodeID = uuid.Generate()
return nil
}
// If we still don't have a valid node ID, make one.
if config.NodeID == "" {
id := uuid.Generate()