journal: do not return errors from remove omap func if omap missing

The previous function used to remove omap keys apparently did not return errors when removing omap keys from a missing omap (oid). Mimic that behavior when using the api. Signed-off-by: John Mulligan <[email protected]>
ceph · Jun 8, 2020 · 4281a94 · 4281a94
1 parent 0ba9363
commit 4281a94
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/internal/journal/omap.go b/internal/journal/omap.go
@@ -77,16 +77,25 @@ func removeMapKeys(
 	}
 
 	err = ioctx.RmOmapKeys(oid, keys)
-	if err != nil {
-		klog.Errorf(
-			util.Log(ctx, "failed removing omap keys (pool=%q, namespace=%q, name=%q): %v"),
-			poolName, namespace, oid, err)
-	} else {
+	switch err {
+	case nil:
 		klog.V(4).Infof(
 			util.Log(ctx, "removed omap keys (pool=%q, namespace=%q, name=%q): %+v"),
 			poolName, namespace, oid, keys)
+	case rados.ErrNotFound:
+		// the previous implementation of removing omap keys (via the cli)
+		// treated failure to find the omap as a non-error. Do so here to
+		// mimic the previous behavior.
+		klog.V(4).Infof(
+			util.Log(ctx, "when removing omap keys, omap not found (pool=%q, namespace=%q, name=%q): %+v"),
+			poolName, namespace, oid, keys)
+	default:
+		klog.Errorf(
+			util.Log(ctx, "failed removing omap keys (pool=%q, namespace=%q, name=%q): %v"),
+			poolName, namespace, oid, err)
+		return err
 	}
-	return err
+	return nil
 }
 
 func setOMapKeys(