Skip to content

xrootd: improve handling of prepare options #8266

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

Merged
kofemann merged 1 commit into from
Oct 23, 2026
Merged

xrootd: improve handling of prepare options #8266

Show file tree
Hide file tree
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
32 changes: 21 additions & 11 deletions modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdRedirectHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,18 +1162,28 @@ protected XrootdResponse<PrepareRequest> doOnPrepare(ChannelHandlerContext ctx,
Restriction restriction = loginSessionInfo.getRestriction();
InetSocketAddress clientAddress = getSourceAddress();

if (request.getOptions() == 0
|| (request.isStage() && !(request.isEvict() || request.isCancel()))) {
_door.pin(paths, clientAddress, subject, restriction);
return new PrepareResponse(request, kXR_ok, new byte[paths.length]);
} else if (request.isStage() && (request.isEvict() || request.isCancel())) {
throw new XrootdException(kXR_InvalidRequest,
"Invalid parameters / conflicting options");
} else if (request.isCancel() || request.isEvict()) {
_door.unpin(paths, subject, restriction);
return new PrepareResponse(request, kXR_ok, new byte[paths.length]);
// if no options specified just return success

if (request.getOptions() == 0 && request.getOptionX() == 0) {
return new PrepareResponse(request,
kXR_ok, new byte[paths.length]);
}

if (request.isStage()) {
if (request.isEvict() || request.isCancel()) {
throw new XrootdException(kXR_InvalidRequest,
"Invalid parameters / conflicting options");
} else {
_door.pin(paths, clientAddress, subject, restriction);
return new PrepareResponse(request, kXR_ok, new byte[paths.length]);
}
} else {
throw new XrootdException(kXR_Unsupported, "Unsupported option(s)");
if (request.isCancel() || request.isEvict()) {
_door.unpin(paths, subject, restriction);
return new PrepareResponse(request, kXR_ok, new byte[paths.length]);
} else {
throw new XrootdException(kXR_Unsupported, "Unsupported option(s)");
}
}
} catch (PermissionDeniedCacheException e) {
throw xrootdException(e);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<version.smc>7.6.0</version.smc>
<version.xerces>2.12.0</version.xerces>
<version.jetty>9.4.57.v20241219</version.jetty>
<version.xrootd4j>4.6.5</version.xrootd4j>
<version.xrootd4j>4.6.6</version.xrootd4j>
<version.jersey>2.47</version.jersey>
<version.dcache-view>3.0.0</version.dcache-view>
<version.dcache-view-admin>3.0.0</version.dcache-view-admin>
Expand Down
Loading