Moved the scs conf from --conf to env var #4177
Merged
+60
−1
Conversation
This file contains hidden or 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
nemacysts
approved these changes
Dec 8, 2025
| environment = instance_config.get_env_dictionary() # type: ignore | ||
|
|
||
| # Pop out scs_conf from spark_conf and store it in the environment, in sync with the tron_tools code | ||
| environment["SCS_CONF_STR"] = spark_conf.pop("scs_conf", None) |
Member
There was a problem hiding this comment.
imo, it'll probably be a little more robust to have individual env vars for all the data we'd pass down (several of which already exist) so that we don't have to worry about ensuring that this string is always valid json
...but maybe this won't be a problem!
cuza
added a commit
that referenced
this pull request
Dec 16, 2025
…w-terminating-pods * master: Released 1.36.3 via make release Moved the scs conf from --conf to env var (#4177) Released 1.36.2 via make release Revert "remove some unused code." Released 1.36.1 via make release Revert "Merge pull request #4151 from Yelp/timma/upgrade_spark_configuration_lib_to_3.3.7" (#4174) Released 1.36.0 via make release Released 1.35.8 via make release remove some mesos-isms from local-run remove some unused code. Changed the expected_scs_conf to json instead of raw string Changed the user to null in scs_conf which fixes the failing tron_tools test Upgraded service configuration lib to 3.3.7 and updated the test accordingly
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.
service_configuration_libto3.3.7paasta validateran successfully