Let snapshot remove accept a remote-only snapshot's remote key (closes #400)
check / check (push) Successful in 13m35s
check / check (push) Successful in 13m35s
snapshot remove hashed its argument into a remote key, so the remote key that snapshot list shows for a remote-only snapshot never matched. A remote key or a leading part of it is now resolved with resolveSnapshotRemoteKey, as snapshot verify and snapshot restore do. Model: opus-5-5
This commit was merged in pull request #458.
This commit is contained in:
1 parent
1df6867cd4
commit
d747ddef3a
4 files changed
+114
-13
No files matched your search
@@ -1467,7 +1467,8 @@ func (v *Vaultik) RemoveSnapshot(
|
||||
return result, err
|
||||
}
|
||||
|
||||
inLocalIndex, err := v.checkSnapshotExists(snapshotID, opts.LocalOnly)
|
||||
snapshotID, remoteKey, inLocalIndex, err := v.findSnapshotToRemove(
|
||||
snapshotID, opts.LocalOnly)
|
||||
if err != nil {
|
||||
return result, err
|
||||
}
|
||||
@@ -1498,7 +1499,7 @@ func (v *Vaultik) RemoveSnapshot(
|
||||
}
|
||||
|
||||
result.RemoteRemoved, err = v.removeSnapshotRemote(
|
||||
snapshotID, inLocalIndex, markerErr, opts)
|
||||
snapshotID, remoteKey, inLocalIndex, markerErr, opts)
|
||||
if err != nil {
|
||||
return result, err
|
||||
}
|
||||
@@ -1530,6 +1531,41 @@ func (v *Vaultik) RemoveSnapshot(
|
||||
return result, nil
|
||||
}
|
||||
|
||||
// findSnapshotToRemove returns the ID of the snapshot that identifier
|
||||
// names, its remote key, and whether the local index holds it. A remote
|
||||
// key, or the leading part of one, is resolved on the destination store;
|
||||
// when the local index holds the snapshot with that key, its ID is
|
||||
// returned, so it is removed from both.
|
||||
func (v *Vaultik) findSnapshotToRemove(
|
||||
identifier string, localOnly bool,
|
||||
) (string, string, bool, error) {
|
||||
if !isRemoteKeyOrPrefix(identifier) || localOnly {
|
||||
inLocalIndex, err := v.checkSnapshotExists(identifier, localOnly)
|
||||
|
||||
return identifier, snapshot.RemoteSnapshotKey(identifier),
|
||||
inLocalIndex, err
|
||||
}
|
||||
|
||||
remoteKey, err := v.resolveSnapshotRemoteKey(identifier)
|
||||
if err != nil {
|
||||
return "", "", false, err
|
||||
}
|
||||
|
||||
localIDs, err := v.localSnapshotIDs()
|
||||
if err != nil {
|
||||
return "", "", false, fmt.Errorf(
|
||||
"looking up snapshot in local index: %w", err)
|
||||
}
|
||||
|
||||
for _, id := range localIDs {
|
||||
if snapshot.RemoteSnapshotKey(id) == remoteKey {
|
||||
return id, remoteKey, true, nil
|
||||
}
|
||||
}
|
||||
|
||||
return identifier, remoteKey, false, nil
|
||||
}
|
||||
|
||||
// checkSnapshotExists returns errSnapshotNotFound when the local index
|
||||
// has no row for snapshotID and, unless localOnly is set, the
|
||||
// destination store has no metadata for it either. inLocalIndex reports
|
||||
@@ -1638,8 +1674,8 @@ func (v *Vaultik) confirmRemoveSnapshot(snapshotID string, opts *RemoveOptions)
|
||||
return true
|
||||
}
|
||||
|
||||
// removeSnapshotRemote strips the snapshot's metadata from the
|
||||
// destination store. It returns true only when the delete finished
|
||||
// removeSnapshotRemote strips the snapshot's metadata, under remoteKey,
|
||||
// from the destination store. It returns true only when the delete finished
|
||||
// without an error and removed at least one object; under LocalOnly it
|
||||
// does nothing. markerErr is the result of checkDestinationMarker; when
|
||||
// it is set, nothing is deleted and it is the failure. When the snapshot
|
||||
@@ -1651,7 +1687,7 @@ func (v *Vaultik) confirmRemoveSnapshot(snapshotID string, opts *RemoveOptions)
|
||||
// (`vaultik prune` never removes snapshot metadata that has its
|
||||
// manifest).
|
||||
func (v *Vaultik) removeSnapshotRemote(
|
||||
snapshotID string, inLocalIndex bool, markerErr error,
|
||||
snapshotID, remoteKey string, inLocalIndex bool, markerErr error,
|
||||
opts *RemoveOptions,
|
||||
) (bool, error) {
|
||||
if opts.LocalOnly {
|
||||
@@ -1665,8 +1701,7 @@ func (v *Vaultik) removeSnapshotRemote(
|
||||
|
||||
err := markerErr
|
||||
if err == nil {
|
||||
deleted, err = v.deleteRemoteSnapshotByKey(
|
||||
snapshot.RemoteSnapshotKey(snapshotID))
|
||||
deleted, err = v.deleteRemoteSnapshotByKey(remoteKey)
|
||||
}
|
||||
|
||||
if err != nil && !inLocalIndex {
|
||||
|
||||
Reference in new issue
Block a user