Skip to content

Commit

Permalink
dcache-xroot,pom.xml: bump xrootd4j to 4.3.1
Browse files Browse the repository at this point in the history 
For additional diagnostic logging at INFO level.

See:  https://rb.dcache.org/r/13572/
      commit master@a6d832718ff3e2e875d59d620c7fd06cb7d8a27f

Calls to withError() have been given the required
extra ChannelContext parameter.

Target: master => 4.3.1
Request: 8.1   => 4.3.1
Request: 8.0   => 4.2.7
Request: 7.2   => 4.2.7
Request: 7.1   => 4.1.8
Request: 7.0   => 4.0.13
Request: 6.2   => 4.0.13
Patch:  https://rb.dcache.org/r/13577/
Requires-notes: no
Requires-book: no
Acked-by: Lea
Acked-by: Tigran
  • Loading branch information
@alrossi
alrossi committed Jun 7, 2022
1 parent 45d7bd5 commit d5c4f49
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 27 deletions.
40 changes: 21 additions & 19 deletions modules/dcache-xrootd/src/main/java/org/dcache/xrootd/door/XrootdRedirectHandler.java
View file
Expand Up @@ -315,7 +315,8 @@ protected XrootdResponse<OpenRequest> doOnOpen(ChannelHandlerContext ctx, OpenRe
FsPath path = createFullPath(req.getPath());

XrootdResponse response
= conditionallyHandleThirdPartyRequest(req,
= conditionallyHandleThirdPartyRequest(ctx,
req,
loginSessionInfo,
opaque,
path,
Expand Down Expand Up @@ -449,21 +450,21 @@ protected XrootdResponse<OpenRequest> doOnOpen(ChannelHandlerContext ctx, OpenRe
return new RedirectResponse<>(req, host, address.getPort(),
opaqueString, "");
} catch (ParseException e) {
return withError(req, kXR_ArgInvalid, "Path arguments do not parse");
return withError(ctx, req, kXR_ArgInvalid, "Path arguments do not parse");
} catch (FileNotFoundCacheException e) {
return withError(req, xrootdErrorCode(e.getRc()), "No such file");
return withError(ctx, req, xrootdErrorCode(e.getRc()), "No such file");
} catch (FileExistsCacheException e) {
return withError(req, kXR_NotAuthorized, "File already exists");
return withError(ctx, req, kXR_NotAuthorized, "File already exists");
} catch (TimeoutCacheException e) {
return withError(req, xrootdErrorCode(e.getRc()), "Internal timeout");
return withError(ctx, req, xrootdErrorCode(e.getRc()), "Internal timeout");
} catch (PermissionDeniedCacheException e) {
return withError(req, xrootdErrorCode(e.getRc()), e.getMessage());
return withError(ctx, req, xrootdErrorCode(e.getRc()), e.getMessage());
} catch (FileIsNewCacheException e) {
return withError(req, xrootdErrorCode(e.getRc()), "File is locked by upload");
return withError(ctx, req, xrootdErrorCode(e.getRc()), "File is locked by upload");
} catch (NotFileCacheException e) {
return withError(req, xrootdErrorCode(e.getRc()), "Not a file");
return withError(ctx, req, xrootdErrorCode(e.getRc()), "Not a file");
} catch (CacheException e) {
return withError(req, xrootdErrorCode(e.getRc()),
return withError(ctx, req, xrootdErrorCode(e.getRc()),
String.format("Failed to open file (%s [%d])",
e.getMessage(), e.getRc()));
} catch (InterruptedException e) {
Expand All @@ -472,9 +473,9 @@ protected XrootdResponse<OpenRequest> doOnOpen(ChannelHandlerContext ctx, OpenRe
* message will never reach the client, so saying that the
* server shut down is okay.
*/
return withError(req, kXR_ServerError, "Server shutdown");
return withError(ctx, req, kXR_ServerError, "Server shutdown");
} catch (XrootdException e) {
return withError(req, e.getError(), e.getMessage());
return withError(ctx, req, e.getError(), e.getMessage());
}
}

Expand All @@ -493,7 +494,8 @@ protected XrootdResponse<OpenRequest> doOnOpen(ChannelHandlerContext ctx, OpenRe
* only has been used, we allow rendezvous to take </p>
*/
private XrootdResponse<OpenRequest>
conditionallyHandleThirdPartyRequest(OpenRequest req,
conditionallyHandleThirdPartyRequest(ChannelHandlerContext ctx,
OpenRequest req,
LoginSessionInfo loginSessionInfo,
Map<String, String> opaque,
FsPath fsPath,
Expand Down Expand Up @@ -606,7 +608,7 @@ protected XrootdResponse<OpenRequest> doOnOpen(ChannelHandlerContext ctx, OpenRe
+ "ERROR: {}.",
req, info, error);
_door.removeTpcPlaceholder(info.getFd());
return withError(req, kXR_InvalidRequest,
return withError(ctx, req, kXR_InvalidRequest,
"tpc rendezvous for " + tpcKey
+ ": " + error);
case CANCELLED:
Expand All @@ -616,7 +618,7 @@ protected XrootdResponse<OpenRequest> doOnOpen(ChannelHandlerContext ctx, OpenRe
+ "CANCELLED: {}.",
req, info, error);
_door.removeTpcPlaceholder(info.getFd());
return withError(req, kXR_InvalidRequest,
return withError(ctx, req, kXR_InvalidRequest,
"tpc rendezvous for " + tpcKey
+ ": " + error);
}
Expand All @@ -637,7 +639,7 @@ protected XrootdResponse<OpenRequest> doOnOpen(ChannelHandlerContext ctx, OpenRe
* it, an error can be returned.
*/
info.setStatus(Status.ERROR);
return withError(req, kXR_InvalidRequest,
return withError(ctx, req, kXR_InvalidRequest,
"not allowed to read file.");
}

Expand Down Expand Up @@ -759,7 +761,7 @@ protected XrootdResponse<CloseRequest> doOnClose(ChannelHandlerContext ctx, Clos
if (_door.removeTpcPlaceholder(fd)) {
return withOk(msg);
} else {
return withError(msg, kXR_FileNotOpen,
return withError(ctx, msg, kXR_FileNotOpen,
"Invalid file handle " + fd
+ " for tpc source close.");
}
Expand Down Expand Up @@ -1192,7 +1194,7 @@ public void failure(int rc, Object error) {
}

respond(_context,
withError(_request, xrootdErrorCode(rc), errorMessage));
withError(_context, _request, xrootdErrorCode(rc), errorMessage));
}

/**
Expand All @@ -1201,7 +1203,7 @@ public void failure(int rc, Object error) {
@Override
public void noroute(CellPath path) {
respond(_context,
withError(_request,
withError(_context, _request,
kXR_ServerError,
"Could not contact PNFS Manager."));
}
Expand Down Expand Up @@ -1230,7 +1232,7 @@ public void success(PnfsListDirectoryMessage message) {
@Override
public void timeout(String error) {
respond(_context,
withError(_request,
withError(_context, _request,
kXR_ServerError,
"Timeout when trying to list directory!"));
}
Expand Down
6 changes: 3 additions & 3 deletions modules/dcache-xrootd/src/main/java/org/dcache/xrootd/pool/XrootdPoolRequestHandler.java
View file
Expand Up @@ -781,13 +781,13 @@ protected XrootdResponse<CloseRequest> doOnClose(ChannelHandlerContext ctx, Clos
Throwable cause = e.getCause();
if (cause instanceof CacheException) {
int rc = ((CacheException) cause).getRc();
respond(ctx, withError(msg,
respond(ctx, withError(ctx, msg,
CacheExceptionMapper.xrootdErrorCode(rc),
cause.getMessage()));
} else if (cause instanceof IOException) {
respond(ctx, withError(msg, kXR_IOError, cause.getMessage()));
respond(ctx, withError(ctx,msg, kXR_IOError, cause.getMessage()));
} else {
respond(ctx, withError(msg, kXR_ServerError, cause.toString()));
respond(ctx, withError(ctx,msg, kXR_ServerError, cause.toString()));
}
} finally {
removeDescriptor(fd);
Expand Down
8 changes: 4 additions & 4 deletions modules/dcache-xrootd/src/main/java/org/dcache/xrootd/tpc/TpcWriteDescriptor.java
View file
Expand Up @@ -178,11 +178,11 @@ public synchronized void fireDelayedSync(int result, String error) {
.addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
} else if (error != null) {
userResponseCtx.writeAndFlush(
new ErrorResponse<>(syncRequest, result, error))
new ErrorResponse<>(userResponseCtx, syncRequest, result, error))
.addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
} else {
userResponseCtx.writeAndFlush(
new ErrorResponse<>(syncRequest, errno, client.getError()))
new ErrorResponse<>(userResponseCtx, syncRequest, errno, client.getError()))
.addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
}
}
Expand All @@ -191,7 +191,7 @@ public synchronized void fireDelayedSync(int result, String error) {
public synchronized XrootdResponse<StatRequest> handleStat(StatRequest msg)
throws XrootdException {
if (client.getError() != null) {
return new ErrorResponse<>(msg,
return new ErrorResponse<>(userResponseCtx, msg,
client.getErrno(),
client.getError());
}
Expand Down Expand Up @@ -278,7 +278,7 @@ public synchronized void redirect(ChannelHandlerContext ctx,
public synchronized XrootdResponse<SyncRequest> sync(SyncRequest syncRequest)
throws IOException, InterruptedException {
if (client.getError() != null) {
return new ErrorResponse<>(syncRequest,
return new ErrorResponse<>(userResponseCtx, syncRequest,
client.getErrno(),
client.getError());
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -68,7 +68,7 @@
<version.smc>6.6.0</version.smc>
<version.xerces>2.12.0</version.xerces>
<version.jetty>9.4.35.v20201120</version.jetty>
<version.xrootd4j>4.1.7</version.xrootd4j>
<version.xrootd4j>4.1.8</version.xrootd4j>
<version.jersey>2.28</version.jersey>
<version.dcache-view>1.6.3</version.dcache-view>
<version.netty>4.1.59.Final</version.netty>
Expand Down

0 comments on commit d5c4f49

Please sign in to comment.