Skip to content

EbsUtils: Fall back to the SUCCESSFUL flag when snapshot state is unset #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mateo-moon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

EbsUtils: Fall back to the SUCCESSFUL flag when snapshot state is unset #517

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion server/src/main/java/com/linbit/linstor/layer/storage/ebs/EbsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.linbit.linstor.core.objects.Node;
import com.linbit.linstor.core.objects.Resource;
import com.linbit.linstor.core.objects.Snapshot;
import com.linbit.linstor.core.objects.SnapshotDefinition;
import com.linbit.linstor.core.objects.SnapshotVolume;
import com.linbit.linstor.core.objects.StorPool;
import com.linbit.linstor.core.objects.Volume;
Expand Down Expand Up @@ -201,7 +202,23 @@ public static boolean isSnapshotCompleted(Snapshot snapshotRef)
while (snapVlmIt.hasNext())
{
SnapshotVolume snapVlm = snapVlmIt.next();
allCompleted &= snapVlm.getState().equals(EBS_SNAP_STATE_COMPLETED);
@Nullable String state = snapVlm.getState();
if (state == null)
{
/*
* The in-memory state is only populated by the EBS status poller, so it can be unset
* right after the snapshot was taken or after a controller restart. A snapshot whose
* creation flow finished (SUCCESSFUL flag) was already confirmed 'completed' by AWS
* before the satellite reported success, so fall back to that flag.
*/
allCompleted &= snapshotRef.getSnapshotDefinition()
.getFlags()
.isSet(SnapshotDefinition.Flags.SUCCESSFUL);
}
else
{
allCompleted &= state.equals(EBS_SNAP_STATE_COMPLETED);
}
}
return allCompleted;
}
Expand Down