Skip to content
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.

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

Add cluster join command line options and configuration options #527

Merged
merged 9 commits into from
Dec 9, 2015

Conversation

ChrisAubuchon
Copy link
Contributor

  • Adds -rejoin, -join, -retry-join, -retry-max and -retry-interval command line options
  • Adds start_join, retry_join, retry_max, retry_interval and rejoin_after_leave server configuration options

@cbednarski
Copy link
Contributor

Thanks for the PR. Can you also update the website documentation under website?

@ChrisAubuchon
Copy link
Contributor Author

I updated config.html.md. Is there anywhere else that needs to be changed?

@@ -358,14 +388,6 @@ func (a *Config) Merge(b *Config) *Config {
result.AdvertiseAddrs = result.AdvertiseAddrs.Merge(b.AdvertiseAddrs)
}

// Apply the Atlas configuration
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bad git'ing on my part.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@cbednarski
Copy link
Contributor

I updated config.html.md. Is there anywhere else that needs to be changed?

Looks great! That's probably the only spot in the docs that needs an update.

@c4milo
Copy link
Contributor

c4milo commented Dec 7, 2015

I'm looking forward to having this PR merged to make cluster bootstrapping more automatic.

if cmdConfig.Server.RetryInterval != "" {
dur, err := time.ParseDuration(cmdConfig.Server.RetryInterval)
if err != nil {
c.Ui.Error(fmt.Sprintf("Error: %s", err))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add some extra information in the error message to indicate which field Nomad was not about to parse? I think that would help the user to quickly debug what's wrong in the configuration file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the error message to Error parsing retry interval

@diptanu
Copy link
Contributor

diptanu commented Dec 9, 2015

Merging this PR into a branch to do more testing and understand how the UX works.

@@ -396,12 +416,16 @@ func (c *Command) Run(args []string) int {
// Enable log streaming
logGate.Flush()

// Start retry join process
errCh := make(chan struct{})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add the retryJoinErr channel to the Command struct so we don't have to pass the channel into the functions

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added to the Command struct

@dadgar
Copy link
Contributor

dadgar commented Dec 9, 2015

Thanks @ChrisAubuchon

dadgar added a commit that referenced this pull request Dec 9, 2015
Add cluster join command line options and configuration options
@dadgar dadgar merged commit 2e3fd73 into hashicorp:master Dec 9, 2015
@github-actions
Copy link

github-actions bot commented May 1, 2023

I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants