[server] Fix upload handling if image already exists

3 files changed, 73 insertions, 15 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
index 8c00ad60..549bfaec 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
@@ -161,7 +161,7 @@ public class FileServer implements IncomingEvent {
 		IncomingDataTransfer upload;
 		try {
 			upload = new IncomingDataTransfer(key, owner, image, destinationFile, fileSize, sha1Sums,
-					machineDescription);
+					machineDescription, false);
 		} catch (FileNotFoundException e) {
 			LOGGER.error("Could not open destination file for writing", e);
 			throw new TTransferRejectedException("Destination file not writable!");
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
index 5c7621a9..8bda7cab 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
@@ -13,6 +13,7 @@ import javax.net.ssl.SSLContext;
 
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.sat.database.mappers.DbImage;
+import org.openslx.bwlp.sat.database.mappers.DbImageBlock;
 import org.openslx.bwlp.sat.util.Configuration;
 import org.openslx.bwlp.sat.util.Constants;
 import org.openslx.bwlp.sat.util.FileSystem;
@@ -20,10 +21,12 @@ import org.openslx.bwlp.sat.util.Formatter;
 import org.openslx.bwlp.thrift.iface.ImageDetailsRead;
 import org.openslx.bwlp.thrift.iface.ImagePublishData;
 import org.openslx.bwlp.thrift.iface.ImageVersionWrite;
+import org.openslx.bwlp.thrift.iface.TNotFoundException;
 import org.openslx.bwlp.thrift.iface.TransferInformation;
 import org.openslx.bwlp.thrift.iface.TransferState;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.filetransfer.Downloader;
+import org.openslx.filetransfer.util.ChunkStatus;
 import org.openslx.filetransfer.util.FileChunk;
 import org.openslx.filetransfer.util.IncomingTransferBase;
 import org.openslx.util.ThriftUtil;
@@ -68,17 +71,18 @@ public class IncomingDataTransfer extends IncomingTransferBase {
 	private final TransferInformation masterTransferInfo;
 
 	public IncomingDataTransfer(String uploadId, UserInfo owner, ImageDetailsRead image,
-			File destinationFile, long fileSize, List<byte[]> sha1Sums, byte[] machineDescription)
-			throws FileNotFoundException {
+			File destinationFile, long fileSize, List<byte[]> sha1Sums, byte[] machineDescription,
+			boolean repairUpload) throws FileNotFoundException {
 		super(uploadId, destinationFile, fileSize, sha1Sums);
-		this.owner = owner;
+		this.owner = repairUpload ? null : owner;
 		this.image = image;
 		this.machineDescription = machineDescription;
 		this.masterTransferInfo = null;
+		initRepairUpload();
 	}
 
-	public IncomingDataTransfer(ImagePublishData publishData, File tmpFile, TransferInformation transferInfo)
-			throws FileNotFoundException {
+	public IncomingDataTransfer(ImagePublishData publishData, File tmpFile, TransferInformation transferInfo,
+			boolean repairUpload) throws FileNotFoundException {
 		super(UUID.randomUUID().toString(), tmpFile, publishData.fileSize,
 				ThriftUtil.unwrapByteBufferList(transferInfo.blockHashes));
 		ImageDetailsRead idr = new ImageDetailsRead();
@@ -94,11 +98,29 @@ public class IncomingDataTransfer extends IncomingTransferBase {
 		idr.setUpdaterId(publishData.uploader.userId);
 		idr.setUpdateTime(publishData.createTime);
 		idr.setVirtId(publishData.virtId);
-		this.owner = publishData.uploader;
+		this.owner = repairUpload ? null : publishData.uploader;
 		this.image = idr;
 		this.machineDescription = ThriftUtil.unwrapByteBuffer(transferInfo.machineDescription);
 		this.masterTransferInfo = transferInfo;
 		this.versionSettings = new ImageVersionWrite(false);
+		initRepairUpload();
+	}
+
+	private void initRepairUpload() {
+		if (!isRepairUpload())
+			return;
+		if (getTmpFileName().exists() && getTmpFileName().length() > 0) {
+			try {
+				List<Boolean> statusList = DbImageBlock.getMissingStatusList(getVersionId());
+				if (!statusList.isEmpty()) {
+					getChunks().resumeFromStatusList(statusList, getTmpFileName().length());
+					for (int i = 0; i < 3; ++i) {
+						queueUnhashedChunk(false);
+					}
+				}
+			} catch (SQLException e) {
+			}
+		}
 	}
 
 	/**
@@ -148,6 +170,8 @@ public class IncomingDataTransfer extends IncomingTransferBase {
 	 * @param data
 	 */
 	public boolean setVersionData(UserInfo user, ImageVersionWrite data) {
+		if (isRepairUpload())
+			return false;
 		synchronized (versionWrittenToDb) {
 			if (versionWrittenToDb.get()) {
 				return false;
@@ -170,8 +194,17 @@ public class IncomingDataTransfer extends IncomingTransferBase {
 		potentialFinishTime.set(System.currentTimeMillis());
 		// If owner is not set, this was a repair-transfer, which downloads directly to the existing target file.
 		// Nothing more to do in that case.
-		if (isRepairUpload())
+		if (isRepairUpload()) {
+			try {
+				DbImage.markValid(true, false, DbImage.getLocalImageData(getVersionId()));
+			} catch (TNotFoundException e) {
+				LOGGER.warn("Apparently, the image " + getVersionId()
+						+ " that was just repaired doesn't exist...");
+			} catch (SQLException e) {
+			}
 			return true;
+		}
+		// It's a fresh upload
 		LOGGER.info("Finalizing uploaded image " + image.imageName);
 		// Ready to go. First step: Rename temp file to something usable
 		String ext = "img";
@@ -291,7 +324,15 @@ public class IncomingDataTransfer extends IncomingTransferBase {
 
 	@Override
 	protected void chunkStatusChanged(FileChunk chunk) {
-		// TODO Update in DB in case this is a repair upload
+		if (!isRepairUpload())
+			return;
+		ChunkStatus status = chunk.getStatus();
+		if (status == ChunkStatus.MISSING || status == ChunkStatus.COMPLETE) {
+			try {
+				DbImageBlock.asyncUpdate(getVersionId(), chunk);
+			} catch (InterruptedException e) {
+			}
+		}
 	}
 
 }
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/SyncTransferHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/SyncTransferHandler.java
index cd46a1c5..f3d64784 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/SyncTransferHandler.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/SyncTransferHandler.java
@@ -16,6 +16,7 @@ import java.util.concurrent.TimeUnit;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.sat.database.mappers.DbImage;
+import org.openslx.bwlp.sat.database.mappers.DbImageBlock;
 import org.openslx.bwlp.sat.database.mappers.DbUser;
 import org.openslx.bwlp.sat.database.models.ImageVersionMeta;
 import org.openslx.bwlp.sat.database.models.LocalImageVersion;
@@ -132,7 +133,7 @@ public class SyncTransferHandler {
 			throw new TInvocationException(InvocationError.MISSING_DATA,
 					"Given virtual machine has no hardware description");
 		ImageDetailsRead details = DbImage.getImageDetails(null, imgVersion.imageBaseId);
-		List<ByteBuffer> blockHashes = DbImage.getBlockHashes(imgVersion.imageVersionId);
+		List<ByteBuffer> blockHashes = DbImageBlock.getBlockHashes(imgVersion.imageVersionId);
 		ImagePublishData publishData = new ImagePublishData();
 		publishData.createTime = imgVersion.createTime;
 		publishData.description = details.description;
@@ -193,13 +194,29 @@ public class SyncTransferHandler {
 			throw new TInvocationException(InvocationError.INTERNAL_SERVER_ERROR,
 					"Communication with master server failed");
 		}
-		File tmpFile = null;
-		do {
-			tmpFile = Formatter.getTempImageName();
-		} while (tmpFile.exists());
+		// Already exists? Already complete?
+		LocalImageVersion localImageData;
+		try {
+			localImageData = DbImage.getLocalImageData(image.imageVersionId);
+		} catch (TNotFoundException e) {
+			localImageData = null;
+		} catch (SQLException e) {
+			throw new TInvocationException(InvocationError.INTERNAL_SERVER_ERROR, "Database error");
+		}
+		File tmpFile;
+		if (localImageData == null) {
+			// New
+			tmpFile = null;
+			do {
+				tmpFile = Formatter.getTempImageName();
+			} while (tmpFile.exists());
+		} else {
+			tmpFile = FileSystem.composeAbsoluteImagePath(localImageData);
+		}
 		tmpFile.getParentFile().mkdirs();
 		try {
-			IncomingDataTransfer transfer = new IncomingDataTransfer(image, tmpFile, transferInfo);
+			IncomingDataTransfer transfer = new IncomingDataTransfer(image, tmpFile, transferInfo,
+					localImageData != null);
 			downloads.put(transfer.getId(), transfer);
 			return transfer.getId();
 		} catch (FileNotFoundException e) {