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.

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

vcp from vospace works when system in readonly mode (CADC 13277) #218

Merged
merged 5 commits into from
Mar 28, 2024

Conversation

andamian
Copy link
Contributor

Changed vos to first try the files end point with PullFromVospace. That avoids creating a job, a step that now fails when vault is in ReadOnly mode.
Also added temporary code to make cutout work with the current VOSpace services.

echo -n "Follow the invalid link and fail"
$CPCMD $CERT $CONTAINER/e3link/somefile /tmp >& /dev/null && echo " [FAIL]" && exit -1
$CPCMD $CERT $CONTAINER/e3link/somefile /tmp >& /dev/null && echo " [FAIL]" && exit -
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the 1 removed on purpose?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file looks fine to me. It think it's a diff issue maybe

vos/vos/vos.py Outdated
get_urls = self.get_node_url(source, method='GET',
cutout=cutout, view=view,
full_negotiation=True)
# remove the first one as we already tried that one.
get_urls.pop(0)
# one of the ur
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what the comment is trying to say - it could just be removed?

vos/vos/vos.py Outdated
@@ -2711,12 +2700,13 @@ def update(self, node, recursive=False):
try:
property_url = endpoints.recursive_props
except KeyError as ex:
property_url = endpoints.p
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this line have any effect?

$LOCKCMD $CERT $CONTAINER $VUNLOCK_ARGS > /dev/null || echo " [FAIL]" && exit -1
echo " [OK]"
echo -n "check unlocked container "
echo "$TAGCMD $CERT $CONTAINER $LIST_ARGS"
$TAGCMD $CERT $CONTAINER $LIST_ARGS | grep -q false && set SUCCESS = "true"
$TAGCMD $CERT $CONTAINER $LIST_ARGS | grep -q None && set SUCCESS = "true"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The grep -q false changed to grep -q None in the $TAGCMD executions, but the grep -q true stayed the same in other execution checks. Is that consistent with the service behaviour?

Copy link

codecov bot commented Mar 28, 2024

Codecov Report

Attention: Patch coverage is 63.21839% with 32 lines in your changes are missing coverage. Please review.

Project coverage is 62.14%. Comparing base (f66e357) to head (34f45f9).

Files Patch % Lines
vos/vos/vos.py 63.21% 32 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #218      +/-   ##
==========================================
+ Coverage   61.33%   62.14%   +0.81%     
==========================================
  Files          21       21              
  Lines        2664     2692      +28     
==========================================
+ Hits         1634     1673      +39     
+ Misses       1030     1019      -11     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@andamian andamian merged commit 80b4ed1 into opencadc:master Mar 28, 2024
11 checks passed
@andamian andamian deleted the CADC-13277 branch July 9, 2024 19:54
@andamian andamian restored the CADC-13277 branch July 9, 2024 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants