X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/35db495717a628e0a6ef52a453b8d8ced793c41b..25ded0f5c0b44dfcc97f945331487abf07a91feb:/services/keep-web/s3.go

diff --git a/services/keep-web/s3.go b/services/keep-web/s3.go
index 381a1110b1..f98efd8fdf 100644
--- a/services/keep-web/s3.go
+++ b/services/keep-web/s3.go
@@ -315,7 +315,8 @@ func (h *handler) serveS3(w http.ResponseWriter, r *http.Request) bool {
 		s3ErrorResponse(w, InternalError, err.Error(), r.URL.Path, http.StatusInternalServerError)
 		return true
 	}
-	if r.Method == http.MethodGet || r.Method == http.MethodHead {
+	readfs := fs
+	if writeMethod[r.Method] {
 		// Create a FileSystem for this request, to avoid
 		// exposing incomplete write operations to concurrent
 		// requests.
@@ -514,14 +515,12 @@ func (h *handler) serveS3(w http.ResponseWriter, r *http.Request) bool {
 				return true
 			}
 		}
-		err = fs.Sync()
+		err = h.syncCollection(fs, readfs, fspath)
 		if err != nil {
 			err = fmt.Errorf("sync failed: %w", err)
 			s3ErrorResponse(w, InternalError, err.Error(), r.URL.Path, http.StatusInternalServerError)
 			return true
 		}
-		// Ensure a subsequent read operation will see the changes.
-		h.Cache.ResetSession(token)
 		w.WriteHeader(http.StatusOK)
 		return true
 	case r.Method == http.MethodDelete:
@@ -568,14 +567,12 @@ func (h *handler) serveS3(w http.ResponseWriter, r *http.Request) bool {
 			s3ErrorResponse(w, InvalidArgument, err.Error(), r.URL.Path, http.StatusBadRequest)
 			return true
 		}
-		err = fs.Sync()
+		err = h.syncCollection(fs, readfs, fspath)
 		if err != nil {
 			err = fmt.Errorf("sync failed: %w", err)
 			s3ErrorResponse(w, InternalError, err.Error(), r.URL.Path, http.StatusInternalServerError)
 			return true
 		}
-		// Ensure a subsequent read operation will see the changes.
-		h.Cache.ResetSession(token)
 		w.WriteHeader(http.StatusNoContent)
 		return true
 	default:
@@ -584,6 +581,34 @@ func (h *handler) serveS3(w http.ResponseWriter, r *http.Request) bool {
 	}
 }
 
+// Save modifications to the indicated collection in srcfs, then (if
+// successful) ensure they are also reflected in dstfs.
+func (h *handler) syncCollection(srcfs, dstfs arvados.CustomFileSystem, path string) error {
+	coll, _ := h.determineCollection(srcfs, path)
+	if coll == nil || coll.UUID == "" {
+		return errors.New("could not determine collection to sync")
+	}
+	d, err := srcfs.OpenFile("by_id/"+coll.UUID, os.O_RDWR, 0777)
+	if err != nil {
+		return err
+	}
+	defer d.Close()
+	err = d.Sync()
+	if err != nil {
+		return err
+	}
+	snap, err := d.Snapshot()
+	if err != nil {
+		return err
+	}
+	dstd, err := dstfs.OpenFile("by_id/"+coll.UUID, os.O_RDWR, 0777)
+	if err != nil {
+		return err
+	}
+	defer dstd.Close()
+	return dstd.Splice(snap)
+}
+
 func setFileInfoHeaders(header http.Header, fs arvados.CustomFileSystem, path string) error {
 	maybeEncode := func(s string) string {
 		for _, c := range s {