diff --git a/cmd/frostfs-adm/internal/modules/morph/epoch.go b/cmd/frostfs-adm/internal/modules/morph/epoch.go index 1f622fa8..a96efa43 100644 --- a/cmd/frostfs-adm/internal/modules/morph/epoch.go +++ b/cmd/frostfs-adm/internal/modules/morph/epoch.go @@ -3,6 +3,7 @@ package morph import ( "errors" "fmt" + "strings" "github.com/nspcc-dev/neo-go/pkg/io" "github.com/nspcc-dev/neo-go/pkg/rpcclient/unwrap" @@ -38,7 +39,14 @@ func forceNewEpochCmd(cmd *cobra.Command, _ []string) error { return err } - return wCtx.awaitTx() + if err := wCtx.awaitTx(); err != nil { + if strings.Contains(err.Error(), "invalid epoch") { + cmd.Println("Epoch has already ticked.") + return nil + } + return err + } + return nil } func emitNewEpochCall(bw *io.BufBinWriter, wCtx *initializeContext, nmHash util.Uint160) error {