Skip to content
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.

Sign up for GitHub

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

Use an osdf:// URL for the remote file for OSDF validation #182

Merged
merged 1 commit into from
Jan 7, 2025
Merged

Use an osdf:// URL for the remote file for OSDF validation #182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 10-setup-htcondor.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,13 +595,13 @@ disable_osdf_plugin () {
# Test the Stash/OSDF plugin that's shipped with Condor; disable it if the test fails.
# TODO: This should be moved to additional-htcondor-config.
osdf_plugin=$(condor_config_val OSDF_PLUGIN 2>/dev/null || condor_config_val STASH_PLUGIN 2>/dev/null)
osdf_remote_test_file="/ospool/uc-shared/public/OSG-Staff/validation/test.txt"
osdf_remote_test_url="osdf:///ospool/uc-shared/public/OSG-Staff/validation/test.txt"
osdf_test_file=$(mktemp -t osdf-test-file.XXXXXX)
osdf_debug_log=$(mktemp -t osdf-debug-log.XXXXXX)
if [[ ! $osdf_plugin || ! -f $osdf_plugin || ! -x $osdf_plugin ]]; then
# Can't run it, can't test it. No need to explicitly disable it though.
echo >&2 "Stash/OSDF file transfer plugin is missing or not runnable; stash://, osdf:// URL support nonfunctional"
elif ! timeout 60s "$osdf_plugin" -d "$osdf_remote_test_file" "$osdf_test_file" >/dev/null 2>"$osdf_debug_log"; then
elif ! timeout 60s "$osdf_plugin" -d "$osdf_remote_test_url" "$osdf_test_file" >/dev/null 2>"$osdf_debug_log"; then
disable_osdf_plugin "Stash/OSDF file transfer test failed"
cat >&2 "$osdf_debug_log"
elif [[ ! -s $osdf_test_file ]]; then
Expand Down