Update from original #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
add setting "dbms.directories.import" "/import" neo4j.conf
Required after this bugfix: neo4j/neo4j#9086
…lity for old hardcoded env variables
Configuration from not hardcoded env variables
Copy work in 3.2 to other versions
This fixes a bug where dbms.mode would be set multiple times in the config. Turns out that this is fine for all values EXCEPT dbms.mode=ARBITER. In that case we rely on parsing the config from bash which runs into a problem due to: https://github.com/neo4j/neo4j/blob/6cc2ebb93b39405976801f57173079deea45fd11/packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j-shared.m4#L157 If an entry is defined multiple times, it is regarded as a cumulative option. This is used for JAVA_OPTS and similarly. But for Arbiter we set a different main class. So having multiple dmbs.mode entries will set an incorrect value which means the default main class is called, instead of the Arbiter's. So this fix makes sure to only replace uncommented values in the config, and otherwise always append to the end. Previously we would replace even commented values, but since dmbs.mode is listed twice in the 3.1/3.2/3.3 config (once in the HA-section, once in CC-section) it would get set twice.
Ensure config only has single entries
Store logs from tests for easier debugging from CI
* For values which had old hardcoded versions we would always override the new kind. If the old variable had no value then we wrote that empty value. * Now only sets the values conditionally: if no value for the new kind of variable exists, and then only if the previous variable has a value. And if not, then we write whatever is the default (or nothing).
Fixed setting config values via environment values
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.