xxx: improve error handling

Signed-off-by: John Mulligan <[email protected]>
ceph · May 21, 2020 · 180f674 · 180f674
1 parent 4278fb8
commit 180f674
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/internal/journal/omap.go b/internal/journal/omap.go
@@ -16,9 +16,10 @@ func getOneOMapValue(
 	// fetch and configure the rados ioctx
 	ioctx, err := conn.conn.GetIoctx(poolName)
 	if err != nil {
-		return "", err
+		return "", omapPoolError(poolName, err)
 	}
 	defer ioctx.Destroy()
+
 	if namespace != "" {
 		ioctx.SetNamespace(namespace)
 	}
@@ -60,7 +61,7 @@ func removeOneOMapKey(
 	// fetch and configure the rados ioctx
 	ioctx, err := conn.conn.GetIoctx(poolName)
 	if err != nil {
-		return err
+		return omapPoolError(poolName, err)
 	}
 	defer ioctx.Destroy()
 
@@ -88,7 +89,7 @@ func setOneOMapKey(
 	// fetch and configure the rados ioctx
 	ioctx, err := conn.conn.GetIoctx(poolName)
 	if err != nil {
-		return err
+		return omapPoolError(poolName, err)
 	}
 	defer ioctx.Destroy()
 
@@ -111,3 +112,10 @@ func setOneOMapKey(
 	}
 	return err
 }
+
+func omapPoolError(poolName string, err error) error {
+	if err == rados.ErrNotFound {
+		return util.NewErrPoolNotFound(poolName, err)
+	}
+	return err
+}
diff --git a/internal/util/errors.go b/internal/util/errors.go
@@ -74,3 +74,7 @@ type ErrPoolNotFound struct {
 func (e ErrPoolNotFound) Error() string {
 	return e.Err.Error()
 }
+
+func NewErrPoolNotFound(pool string, err error) ErrPoolNotFound {
+	return ErrPoolNotFound{pool, err}
+}