Commit f5e3e99e authored by Michael Ritter's avatar Michael Ritter
Browse files

Merge branch 'develop'

parents ce321f55 2ce9dc84
......@@ -11,7 +11,7 @@ import javax.persistence.Id;
public class Status {
@Id
@Column
@Column(name = "id")
private String bagId;
@Column(name = "depositor", nullable = false)
......
......@@ -41,7 +41,7 @@ public class RSyncTransfer implements FileTransfer {
Callable<Path> download = new Callable<Path>() {
@Override
public Path call() throws Exception {
String[] cmd = new String[]{"rsync", "-az", user + "@" + uri, local.toString()};
String[] cmd = new String[]{"rsync", "-a", user + "@" + uri, local.toString()};
String[] parts = uri.split(":", 2);
String[] pathList = parts[1].split("/");
ProcessBuilder pb = new ProcessBuilder(cmd);
......@@ -111,7 +111,7 @@ public class RSyncTransfer implements FileTransfer {
threadPool.execute(timedTask);
try {
timedTask.get(15, TimeUnit.MINUTES);
timedTask.get(1, TimeUnit.DAYS);
} catch (InterruptedException | ExecutionException | TimeoutException e) {
log.error("rsync had a critical error", e);
throw new FileTransferException("rsync had a critical error", e);
......
......@@ -86,7 +86,7 @@ public class SnapshotTasklet implements Tasklet {
// And bag (with a sha256 manifest)
builder.loadManifest(Files.newBufferedReader(
snapshotBase.resolve("manifest-sha256.txt"),
snapshotBase.resolve(settings.getDuracloudManifest()),
Charset.defaultCharset()));
builder.newScanPackage();
......
......@@ -17,6 +17,9 @@ public class IntakeSettings extends ChronopolisSettings {
@Value("${duracloud.stage.restore:/export/duracloud/restore}")
private String duracloudRestoreStage;
@Value("${duracloud.manifest:manifest-sha256.txt}")
private String duracloudManifest;
// The intake service only has a direct queue
private String directQueueBinding;
private String directQueueName;
......@@ -56,4 +59,12 @@ public class IntakeSettings extends ChronopolisSettings {
public void setDuracloudRestoreStage(final String duracloudRestoreStage) {
this.duracloudRestoreStage = duracloudRestoreStage;
}
public String getDuracloudManifest() {
return duracloudManifest;
}
public void setDuracloudManifest(final String duracloudManifest) {
this.duracloudManifest = duracloudManifest;
}
}
......@@ -8,9 +8,17 @@ chron.node=umiacs
chron.stage.bags=/export/duraspace/bags
chron.stage.tokens=/export/duraspace/tokens
# Intake specific configuration
# Duracloud Intake specific configuration
duracloud.stage.snapshot=/export/duraspace/snapshots/
duracloud.stage.restore=/export/duraspace/
duracloud.manifest=manifest-sha256.txt
# For connecting to dpn restful api
dpn.web.host=localhost
dpn.web.port=8080
dpn.web.path=dpn
dpn.web.user=user
dpn.web.password=password
# ACE IMS configuration
ace.ims.host=ims.umiacs.umd.edu
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment