Skip to content

[FIXED] Config Reload: JetStream command line override ignored#6609

Merged
derekcollison merged 2 commits intomainfrom
fix_6606
Mar 7, 2025
Merged

[FIXED] Config Reload: JetStream command line override ignored#6609
derekcollison merged 2 commits intomainfrom
fix_6606

Conversation

@kozlovic
Copy link
Copy Markdown
Member

@kozlovic kozlovic commented Mar 7, 2025

When the --js (and --store_dir) command line argument(s) are
given and a configuration reload is issued, JetStream would be
disabled.

This is because we were not tracking the JetStream command line
argument boolean, and also not merging the store_dir option.

Resolves #6606

Signed-off-by: Ivan Kozlovic ivan@synadia.com

@kozlovic kozlovic requested a review from a team as a code owner March 7, 2025 01:35
@derekcollison
Copy link
Copy Markdown
Member

Thanks @kozlovic - @wallyqs can you take a look here?

conf/parse.go Outdated
}
}

func DisableConfigurationDigest(disable bool) {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Since this would become a part of the exported API, I think it would be best if we add comments on why you might want to (or moreover, why you probably shouldn't) use it. It's also not thread-safe if someone does decide to fiddle with things with a running embedded server.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

You know, I don't like it either, and I had started with a private variable in the server that was set it sets, but I would have had the same problem with the tests in the test package.

What I am going to do, is likely revert the changes unrelated to the JS command line parameters and on a different branch, run all tests with a debug statement in place where we ignore and have a sense of how many tests need review and go from there.

I am going to switch this PR to Draft until I have a chance to update it later today.

@kozlovic kozlovic marked this pull request as draft March 7, 2025 13:34
@kozlovic
Copy link
Copy Markdown
Member Author

kozlovic commented Mar 7, 2025

@derekcollison See my comments to Neil. I will update this PR later today and will work on the config digest "issue" separately.

kozlovic added 2 commits March 7, 2025 09:29
When the --js (and --store_dir) command line argument(s) are
given and a configuration reload is issued, JetStream would be
disabled.

This is because we were not tracking the JetStream command line
argument boolean, and also not merging the store_dir option.

Resolves #6606

Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
@kozlovic kozlovic marked this pull request as ready for review March 7, 2025 16:31
@kozlovic
Copy link
Copy Markdown
Member Author

kozlovic commented Mar 7, 2025

@derekcollison @wallyqs @neilalexander Ok, I have removed the changes for the config digest and this PR is ready for review. As I mentioned, I will evaluate separately tests that would need review due to the introduction of config digest.

Copy link
Copy Markdown
Member

@derekcollison derekcollison left a comment

Choose a reason for hiding this comment

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

LGTM

@kozlovic
Copy link
Copy Markdown
Member Author

kozlovic commented Mar 7, 2025

@derekcollison Have we just disabled Travis? It did not run for this update and yet the "All checks have passed" is green...

@wallyqs
Copy link
Copy Markdown
Member

wallyqs commented Mar 7, 2025

(travis should still be enabled)

@derekcollison
Copy link
Copy Markdown
Member

It should kick Travis still..

@kozlovic
Copy link
Copy Markdown
Member Author

kozlovic commented Mar 7, 2025

It should kick Travis still..

Ok, some issues then between GitHub and Travis. I pushed a separate branch and it did not execute yet. Will likely be resolved sooner or later.

Copy link
Copy Markdown
Member

@wallyqs wallyqs left a comment

Choose a reason for hiding this comment

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

LGTM

@derekcollison derekcollison merged commit fcaef6f into main Mar 7, 2025
3 checks passed
@derekcollison derekcollison deleted the fix_6606 branch March 7, 2025 17:46
neilalexander added a commit that referenced this pull request Apr 17, 2025
Includes the following (already cherry-picked) PRs:

- #6587
- #6607
- #6612
- #6609
- #6620
- #6668
- #6674
- #6647
- #6684
- #6691
- #6697
- #6705
- #6706
- #6704
- #6714
- #6720
- #6727
- #6730
- #6726
- #6732
- #6759
- #6753
- #6685
- #6769
- #6777
- #6785
- #6786
- #6778
- #6790
- #6791
- #6798
- #6794
- #6801

Signed-off-by: Neil Twigg <neil@nats.io>

Signed-off-by: Neil Twigg <neil@nats.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

JetStream cmdline arguments are discarded upon reload

4 participants