scylla_node: populate env variable when running scylla-sstable #502
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
if scylla is built in a dtest environment, and the shared libraries which it is linked against cannot be found in the testbed's default ld.so.conf paths, the tests which run scylla-sstable would fail. so, in this change. let's apply the `self._launch_env` when running scylla-sstable as well. previously, these env variables are only applied when launching scylla as a daemon. Signed-off-by: Kefu Chai <[email protected]>
|
only for testing the CCM CI test using Nix. |
|
tested using $ scripts/dbuild_collect_so.sh ~/dev/scylladb/build/cmake/scylla /tmp/dynamic_libs_for_dtest
$ SCYLLA_DBUILD_SO_DIR=/tmp/dynamic_libs_for_dtest JAVA_HOME=/usr/lib/jvm/jre-11 pytest --cassandra-dir $HOME/dev/scylladb/build/cmake scylla_sstable_test.py::TestScyllaSstableDumpData::test_scylla_sstable_basicnot really a dbuild build. but i also verified by checking the env variables manually. |
|
I'll for @bhalevy to confirm, as the one that was hit by this issue, to validate it's solving it |
denesb
approved these changes
Aug 29, 2023
nit: s/dtest/dbuild/
|
bhalevy
reviewed
Aug 29, 2023
| env = self._launch_env | ||
| except AttributeError: | ||
| env = os.environ | ||
| res = subprocess.run(common_args + sstables, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=True, env=env) |
There was a problem hiding this comment.
LGTM. This is almost identical to the change I made in my tree.
bhalevy
approved these changes
Aug 29, 2023
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.
if scylla is built in a dtest environment, and the shared libraries which it is linked against cannot be found in the testbed's default ld.so.conf paths, the tests which run scylla-sstable would fail.
so, in this change. let's apply the
self._launch_envwhen running scylla-sstable as well. previously, these env variables are only applied when launching scylla as a daemon.