pin rm fails appropriately for indirect pins

whyrusleeping · whyrusleeping · commit c2fc8bc3cc08 · 2015-07-10T11:03:15.000-07:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/pin/pin.go b/pin/pin.go
@@ -127,18 +127,26 @@ func (p *pinner) Pin(ctx context.Context, node *mdag.Node, recurse bool) error {
 func (p *pinner) Unpin(ctx context.Context, k key.Key, recursive bool) error {
 	p.lock.Lock()
 	defer p.lock.Unlock()
-	if p.recursePin.HasKey(k) {
+	reason, pinned, err := p.isPinned(k)
+	if err != nil {
+		return err
+	}
+	if !pinned {
+		return fmt.Errorf("%s is not pinned", k)
+	}
+	switch reason {
+	case "recursive":
 		if recursive {
 			p.recursePin.RemoveBlock(k)
 			return nil
 		} else {
 			return fmt.Errorf("%s is pinned recursively", k)
 		}
-	} else if p.directPin.HasKey(k) {
+	case "direct":
 		p.directPin.RemoveBlock(k)
 		return nil
-	} else {
-		return fmt.Errorf("%s is not pinned", k)
+	default:
+		return fmt.Errorf("%s is pinned indirectly under %s", k, reason)
 	}
 }
 
@@ -152,6 +160,12 @@ func (p *pinner) isInternalPin(key key.Key) bool {
 func (p *pinner) IsPinned(k key.Key) (string, bool, error) {
 	p.lock.RLock()
 	defer p.lock.RUnlock()
+	return p.isPinned(k)
+}
+
+// isPinned is the implementation of IsPinned that does not lock.
+// intended for use by other pinned methods that already take locks
+func (p *pinner) isPinned(k key.Key) (string, bool, error) {
 	if p.recursePin.HasKey(k) {
 		return "recursive", true, nil
 	}
