Apply both environment variables and system properties to user and table config #13011
+52
−23
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #13011 +/- ##
============================================
+ Coverage 61.75% 62.16% +0.41%
+ Complexity 207 198 -9
============================================
Files 2436 2502 +66
Lines 133233 136670 +3437
Branches 20636 21164 +528
============================================
+ Hits 82274 84963 +2689
- Misses 44911 45419 +508
- Partials 6048 6288 +240
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Jackie-Jiang
approved these changes
Apr 26, 2024
| public static <T extends BaseJsonConfig> T applyConfigWithEnvVariablesAndSystemProperties(T config) { | ||
| Map<String, String> combinedMap = new HashMap<>(); | ||
| // Add all system properties to the map | ||
| System.getProperties().forEach((key, value) -> combinedMap.put(String.valueOf(key), String.valueOf(value))); |
There was a problem hiding this comment.
Is the overhead high to dynamically load system properties for each config read?
There was a problem hiding this comment.
this is not happening all the time, so the overhead is not that much.
There was a problem hiding this comment.
I'm thinking maybe we can periodically pull it, but we can iterate if we find this becomes blocker
| @@ -85,7 +85,7 @@ public void testIndexing() { | |||
| ImmutableMap.of("LOAD_MODE", "MMAP", "AWS_ACCESS_KEY", "default_aws_access_key", "AWS_SECRET_KEY", | |||
| "default_aws_secret_key"); | |||
|
|
|||
| indexingConfig = ConfigUtils.applyConfigWithEnvVariables(environment, indexingConfig); | |||
| indexingConfig = ConfigUtils.applyConfigWithEnvVariablesAndSystemProperties(environment, indexingConfig); | |||
There was a problem hiding this comment.
Shall we add some value to the system properties and test out the behavior?
…and table configs, Environment variables take precedence over system properties
xiangfu0
force-pushed
the
use-both-env-var-and-system-props-to-apply-config-template
branch
from
aab7de4
to
499eec2
Compare
xiangfu0
deleted the
use-both-env-var-and-system-props-to-apply-config-template
branch
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.
Apply both environment variables and system properties to user and table configs.
Environment variables take precedence over system properties.