Mark when a file/folder enters the trash bin

backend/version.txt

@@ -1 +1 @@
-2023.3.8
+2023.3.9

provider-integration/integration-module/native/libc_wrapper.cpp

@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -385,6 +386,10 @@ JNIEXPORT jint JNICALL Java_libc_LibC_umask(JNIEnv *env, jobject thisRef, jint m
     return umask(mask);
 }
 
+JNIEXPORT jint JNICALL Java_libc_LibC_touchFile(JNIEnv *env, jobject thisRef, jint fileDescriptor) {
+    return futimes(fileDescriptor, NULL);
+}
+
 #ifdef __cplusplus
 }
 #endif

provider-integration/integration-module/src/main/kotlin/libc/LibC.kt

@@ -61,6 +61,8 @@ class LibC {
     external fun resizePty(masterFd: Int, cols: Int, rows: Int): Int
     external fun umask(mask: Int): Int
 
+    external fun touchFile(fileDescriptor: Int): Int
+
     companion object {
         init {
             var didLoad = false

provider-integration/integration-module/src/main/kotlin/plugins/storage/ucloud/NativeFS.kt

@@ -16,6 +16,7 @@ import dk.sdu.cloud.utils.LinuxOutputStream
 import dk.sdu.cloud.utils.copyTo
 import io.ktor.util.*
 import io.ktor.utils.io.pool.*
+import libc.LibC
 import libc.NativeStat
 import libc.S_ISREG
 import libc.clib
@@ -475,15 +476,22 @@ class NativeFS(
 
     data class MoveShouldContinue(val needsToRecurse: Boolean)
 
-    suspend fun move(source: InternalFile, destination: InternalFile, conflictPolicy: WriteConflictPolicy): MoveShouldContinue {
+    suspend fun move(
+        source: InternalFile,
+        destination: InternalFile,
+        conflictPolicy: WriteConflictPolicy,
+        updateTimestamps: Boolean = false,
+    ): MoveShouldContinue {
         val sourceParent = openFile(source.parent())
         val destinationParent = openFile(destination.parent())
 
         try {
             val sourceFd = LinuxFileHandle.createOrThrow(
                 clib.openat(sourceParent.fd, source.fileName(), 0, DEFAULT_FILE_MODE)
             ) { throw FSException.NotFound() }
-            val sourceStat = nativeStat(sourceFd, autoClose = true)
+            val sourceStat = nativeStat(sourceFd, autoClose = false)
+            if (updateTimestamps) clib.touchFile(sourceFd.fd)
+            sourceFd.close()
             var shouldContinue = false
 
             val desiredFileName = destination.fileName()

provider-integration/integration-module/src/main/kotlin/plugins/storage/ucloud/tasks/TrashTask.kt

@@ -67,7 +67,8 @@ class TrashTask(
                     nativeFs.move(
                         internalFile,
                         targetFile,
-                        WriteConflictPolicy.RENAME
+                        WriteConflictPolicy.RENAME,
+                        updateTimestamps = true,
                     )
 
                 } catch (ex: FSException) {

wiki/release-notes.md

@@ -7,6 +7,12 @@ use.
 Note that each service may have more than one deployment associated with it.
 For details look in the `k8.kts` folders of each microservice.
 
+## 23-10-23
+
+```
+Type 1/SDU Provider @ 2023.3.9
+```
+
 ## 05-09-23
 
 ```