Skip to content

http/tpc: add support for ArchiveMetadata header #8022

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

Open
kofemann wants to merge 1 commit into
base: 11.2
Choose a base branch
from
Open

http/tpc: add support for ArchiveMetadata header #8022

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
10 changes: 10 additions & 0 deletions modules/dcache-webdav/src/main/java/org/dcache/webdav/DcacheResourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import diskCacheV111.util.PnfsHandler;
import diskCacheV111.util.PnfsId;
import diskCacheV111.util.QuotaExceededCacheException;
import diskCacheV111.util.RetentionPolicy;
import diskCacheV111.util.TimeoutCacheException;
import diskCacheV111.vehicles.DoorRequestInfoMessage;
import diskCacheV111.vehicles.DoorTransferFinishedMessage;
Expand Down Expand Up @@ -1858,6 +1859,8 @@ public synchronized void finished(CacheException error) {
private class WriteTransfer extends HttpTransfer {

private final Optional<Checksum> _contentMd5;
/** optional hits to tape system how to store the file */
private final Optional<String> _archiveMetadata;

public WriteTransfer(PnfsHandler pnfs, Subject subject,
Restriction restriction, FsPath path) throws URISyntaxException {
Expand All @@ -1876,6 +1879,8 @@ public WriteTransfer(PnfsHandler pnfs, Subject subject,
throw new UncheckedBadRequestException("Bad Content-MD5 header: " + e.toString(),
null);
}

_archiveMetadata = Optional.ofNullable(ServletRequest.getRequest().getHeader("ArchiveMetadata"));
}

@Override
Expand Down Expand Up @@ -1930,6 +1935,11 @@ public void createNameSpaceEntry() throws CacheException {
}

getMaxUploadSize().ifPresent(this::setMaximumLength);

// for CUSTODIAL files on upload client might provide extra information that should be passed to the tape system
if (_archiveMetadata.isPresent() && getFileAttributes().getRetentionPolicy() == RetentionPolicy.CUSTODIAL) {
getFileAttributes().getStorageInfo().setKey("archive_metadata", _archiveMetadata.get());
}
}

public void relayData(InputStream inputStream)
Expand Down
13 changes: 12 additions & 1 deletion modules/dcache-webdav/src/main/java/org/dcache/webdav/transfer/RemoteTransferHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import diskCacheV111.util.PnfsHandler;
import diskCacheV111.util.PnfsId;
import diskCacheV111.util.QuotaExceededCacheException;
import diskCacheV111.util.RetentionPolicy;
import diskCacheV111.util.TimeoutCacheException;
import diskCacheV111.vehicles.IoDoorEntry;
import diskCacheV111.vehicles.IoJobInfo;
Expand Down Expand Up @@ -905,7 +906,17 @@ private FileAttributes resolvePath() throws ErrorResponseException {
msg = _pnfs.createPnfsEntry(_path.toString(), attributes,
TransferManagerHandler.ATTRIBUTES_FOR_PULL);
}
return msg.getFileAttributes();

var attrs = msg.getFileAttributes();
// for CUSTODIAL files on upload client might provide extra information that should be passed to the tape system
if (attrs.getRetentionPolicy() == RetentionPolicy.CUSTODIAL) {
var archiveMetadata = ServletRequest.getRequest().getHeader("ArchiveMetadata");
if (archiveMetadata != null) {
attrs.getStorageInfo().setKey("archive_metadata", archiveMetadata);
}
}

return attrs;

default:
throw new ErrorResponseException(Response.Status.SC_INTERNAL_SERVER_ERROR,
Expand Down