Skip to content

Commit ef1d7ca

Browse files
fix: wait after pruning. (#15)
1 parent e4fd80a commit ef1d7ca

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION := v0.3.3
1+
VERSION := v0.3.5
22

33
ldflags := $(LDFLAGS)
44
ldflags += -X main.version=$(VERSION)

cmd/supervysor/commands/prune.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func init() {
1515
panic(fmt.Errorf("flag 'home' should be required: %w", err))
1616
}
1717

18-
pruneCmd.Flags().Int64Var(&untilHeight, "until-height", 0, "prune blocks until specified height (excluding)")
18+
pruneCmd.Flags().Int64Var(&untilHeight, "until-height", 0, "prune until specified height (excluding)")
1919
if err := pruneCmd.MarkFlagRequired("until-height"); err != nil {
2020
panic(fmt.Errorf("flag 'until-height' should be required: %w", err))
2121
}

cmd/supervysor/commands/start.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,20 +130,20 @@ var startCmd = &cobra.Command{
130130
if nodeHeight < poolHeight {
131131
pruneHeight = nodeHeight
132132
}
133-
logger.Info("pruning blocks after node shutdown", "until-height", pruneHeight)
133+
logger.Info("pruning after node shutdown", "until-height", pruneHeight)
134134

135135
err = e.PruneData(supervysorConfig.HomePath, pruneHeight-1, supervysorConfig.StatePruning, binaryFlags)
136136
if err != nil {
137-
logger.Error("could not prune blocks", "err", err)
137+
logger.Error("could not prune", "err", err)
138138
return err
139139
}
140140
} else {
141141
if nodeHeight < poolHeight {
142-
logger.Info("pruning blocks after node shutdown", "until-height", nodeHeight)
142+
logger.Info("pruning after node shutdown", "until-height", nodeHeight)
143143

144144
err = e.PruneData(supervysorConfig.HomePath, nodeHeight-1, supervysorConfig.StatePruning, binaryFlags)
145145
if err != nil {
146-
logger.Error("could not prune blocks", "err", err)
146+
logger.Error("could not prune", "err", err)
147147
return err
148148
}
149149
}

executor/executor.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,12 @@ func (e *Executor) PruneData(homePath string, pruneHeight int, statePruning bool
101101
}
102102
err := store.Prune(homePath, int64(pruneHeight)-1, statePruning, e.Logger)
103103
if err != nil {
104-
e.Logger.Error("could not prune blocks, exiting")
104+
e.Logger.Error("could not prune, exiting")
105105
return err
106106
}
107107

108+
time.Sleep(time.Second * time.Duration(10))
109+
108110
if e.Process.GhostMode {
109111
process, err := node.StartGhostNode(e.Cfg, e.Logger, &e.Process, true, flags)
110112
if err != nil {
@@ -113,7 +115,7 @@ func (e *Executor) PruneData(homePath string, pruneHeight int, statePruning bool
113115
if process != nil && process.Pid > 0 {
114116
e.Process.Id = process.Pid
115117
e.Process.GhostMode = true
116-
e.Logger.Info("node started in GhostMode after pruning blocks")
118+
e.Logger.Info("node started in GhostMode after pruning")
117119
} else {
118120
return fmt.Errorf("enabling Ghost Mode failed: process is not defined")
119121
}
@@ -126,7 +128,7 @@ func (e *Executor) PruneData(homePath string, pruneHeight int, statePruning bool
126128
if process != nil && process.Pid > 0 {
127129
e.Process.Id = process.Pid
128130
e.Process.GhostMode = false
129-
e.Logger.Info("Node started in Normal Mode after pruning blocks", "pId", process.Pid)
131+
e.Logger.Info("Node started in Normal Mode after pruning", "pId", process.Pid)
130132
} else {
131133
return fmt.Errorf("GhostMode disabling failed: process is not defined")
132134
}

0 commit comments

Comments
 (0)