make mapper delete the old object in a snapshot

diff --git a/xseg/peers/user/mt-mapperd.c b/xseg/peers/user/mt-mapperd.c
index 3ef0a40..08d3a15 100644 (file)
--- a/xseg/peers/user/mt-mapperd.c
+++ b/xseg/peers/user/mt-mapperd.c
@@ -1755,7 +1755,7 @@ void snapshot_cb(struct peer_req *pr, struct xseg_request *req)
                XSEGLOG2(&lc, I, "Object write of %s completed successfully", mn->object);
                //signal_mapnode since Snapshot was successfull
                signal_mapnode(mn);
-               /*
+
                //do delete old object
                strncpy(tmp.object, old_object_name, old_objectlen);
                tmp.object[old_objectlen] = 0;
@@ -1770,8 +1770,6 @@ void snapshot_cb(struct peer_req *pr, struct xseg_request *req)
                //overwrite copyup node, since tmp is a stack dummy variable
                __set_copyup_node (mio, xreq, mn);
                XSEGLOG2(&lc, I, "Deletion of %s pending", tmp.object);
-               */
-               goto out_ok;
        } else if (req->op == X_SNAPSHOT) {
                //issue write_object;
                mn->flags &= ~MF_OBJECT_SNAPSHOTTING;

diff --git a/xseg/peers/user/mt-sosd.c b/xseg/peers/user/mt-sosd.c
index 0538ce2..b86b6b1 100644 (file)
--- a/xseg/peers/user/mt-sosd.c
+++ b/xseg/peers/user/mt-sosd.c
@@ -612,7 +612,7 @@ int handle_snapshot(struct peerd *peer, struct peer_req *pr)
                        rio->state = STATING;
                        r = do_aio_generic(peer, pr, X_INFO, rio->second_name, NULL, 0, 0);
                        if (r < 0){
-                               XSEGLOG2(&lc, E, "Stating %s failed", rio->second_name_name);
+                               XSEGLOG2(&lc, E, "Stating %s failed", rio->second_name);
                                r = -1;
                                goto out_buf;
                        }