-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
IGNITE-23196 [ducktests] Change JVM options to JDK11 ones #11536
Changes from all commits
0c6fef9
6ed69ec
8984375
8420073
76b2db9
32a56aa
d647c0a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -81,17 +81,19 @@ def check_default_jvm_options__are_not_used__if_merge_with_default_is_false(serv | |
|
||
def check_boolean_options__go_after_default_ones_and_overwrite_them__if_passed_via_jvm_opt(service): | ||
service.context.globals[JFR_ENABLED] = True | ||
spec = IgniteApplicationSpec(service, jvm_opts="-XX:-UnlockCommercialFeatures") | ||
assert "-XX:-UnlockCommercialFeatures" in spec.jvm_opts | ||
assert "-XX:-UnlockCommercialFeatures" in spec.jvm_opts | ||
assert spec.jvm_opts.index("-XX:-UnlockCommercialFeatures") >\ | ||
spec.jvm_opts.index("-XX:+UnlockCommercialFeatures") | ||
spec = IgniteApplicationSpec(service, jvm_opts="-XX:-FlightRecorder") | ||
assert "-XX:-FlightRecorder" in spec.jvm_opts | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We have here 2 identical asserts. I think one of them should be replaced with the Otherwise it doesn't make sense. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed |
||
assert "-XX:+FlightRecorder" in spec.jvm_opts | ||
assert spec.jvm_opts.index("-XX:-FlightRecorder") >\ | ||
spec.jvm_opts.index("-XX:+FlightRecorder") | ||
|
||
|
||
def check_colon_options__go_after_default_ones_and_overwrite_them__if_passed_via_jvm_opt(service): | ||
service.log_dir = "/default-path" | ||
spec = IgniteApplicationSpec(service, jvm_opts=["-Xloggc:/some-non-default-path/gc.log"]) | ||
assert "-Xloggc:/some-non-default-path/gc.log" in spec.jvm_opts | ||
assert "-Xloggc:/default-path/gc.log" in spec.jvm_opts | ||
assert spec.jvm_opts.index("-Xloggc:/some-non-default-path/gc.log") > \ | ||
spec.jvm_opts.index("-Xloggc:/default-path/gc.log") | ||
spec = IgniteApplicationSpec(service, jvm_opts=["-Xlog:gc:/some-non-default-path/gc.log"]) | ||
assert "-Xlog:gc:/some-non-default-path/gc.log" in spec.jvm_opts | ||
assert "-Xlog:gc*=debug,gc+stats*=debug,gc+ergo*=debug:/default-path/gc.log:uptime,time,level,tags" \ | ||
in spec.jvm_opts | ||
assert spec.jvm_opts.index("-Xlog:gc:/some-non-default-path/gc.log") > \ | ||
spec.jvm_opts.index( | ||
"-Xlog:gc*=debug,gc+stats*=debug,gc+ergo*=debug:/default-path/gc.log:uptime,time,level,tags") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Even if the UnlockCommercialFeatures option is not used for JVM 11+ anymore it's not a reason to drop the test for the boolean options support. Just choose another boolean option. The -XX:+FlightRecorder would be ok I think.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Returned the test, tweaked it to check FlightRecorder in options