TDB-20089, TDB-20090: Add support for relay and replica properties; switch to new server options from 12.1#238
Conversation
|
|
||
| options.add("--server-home"); | ||
| options.add(ServerOption.NODE_HOME_DIR.getOption()); | ||
| options.add(working.toString()); | ||
|
|
||
| if (server.getConfigFile() != null) { | ||
| options.add("-f"); |
There was a problem hiding this comment.
relay and replica are only supported with new options, changing the default to the new options would not require any API level changes for the callers
cf09fc0 to
a691a15
Compare
| private List<String> addServerHome(List<String> options, File workingDir) { | ||
| ArrayList<String> args = new ArrayList<>(options.size() + 2); | ||
| args.add("--server-home"); | ||
| // --server-home is compatible with both old and new options |
There was a problem hiding this comment.
did you verify that ALL the options changes in this entire class work for 10.7, 10.11, 10.15, 11.1 and 12.1 ? If there's one mistake it's going to break tests
| * | ||
| * @return deprecated format option, or null if not available in old format | ||
| */ | ||
| public String getDeprecatedOption() { |
There was a problem hiding this comment.
isn't it 'internal' option rather than deprecated?
There was a problem hiding this comment.
They are deprecated.
These options are also part of the deprecated CLI in tools.
And we maybe need to discuss when it is the time to remove them in the code because they are deprecated since years now.
a691a15 to
33f0d93
Compare
mathieucarbou-ibm
left a comment
There was a problem hiding this comment.
Thanks a lot for this nice cleanup!
There was a problem hiding this comment.
In 12.1 we also have the new security-log-dir option
There was a problem hiding this comment.
In 12.1 we also have the new security-log-dir option
c00fb3e to
fa59027
Compare
fa59027 to
0a88f34
Compare
|
|
||
| // 11.x, 12.x and above => TCDB | ||
| // 12.1 and above => TCDB | ||
| if (version.getMajor() >= 12 && version.getMinor() >= 1) { |
There was a problem hiding this comment.
with this condition, future 13+ releases will be ignored if minor ==0, e.g. 13.0, and will get the Distribution107Controller (condition below)
There was a problem hiding this comment.
added test cases for DistributionController types based on different versions
| NODE_BACKUP_DIR("-b", "-backup-dir"), | ||
| SECURITY_DIR("-x", "-security-dir"), | ||
| SECURITY_AUDIT_LOG_DIR("-u", "-audit-log-dir"), | ||
| SECURITY_LOG_DIR(null, "security-log-dir"), |
There was a problem hiding this comment.
shouldn't it be -security-log-dir (with the dash) ?
…witch to new server options from 12.1
0a88f34 to
8d524dd
Compare
No description provided.