TrueCloudLab
/
frostfs-node
19
1
Fork 20
Code Issues 93 Pull Requests 9 Actions Releases Activity

Revert "[#963] node: Go on initialization even deposit notary is hung" 

This reverts commit b4cb54e7ed.

Signed-off-by: aarifullin <a.arifullin@yadro.com>
pull/1042/head
Airat Arifullin 2024-03-13 11:53:59 +03:00
parent f42a529f49
commit 7a4b6057ce
4 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/frostfs-node/config.go
View File

@ -352,12 +352,6 @@ type internals struct {
log *logger.Logger
// Some methods that initialize node components may launch an asynchronous job,
// appending it to workers. That means despite application is already running,
// not all components completely initialized yet.
// initAppWG is used to control this situation.
initAppWG sync.WaitGroup
wg sync.WaitGroup
workers []worker
closers []closer

16
cmd/frostfs-node/main.go
View File

@ -67,10 +67,7 @@ func main() {
bootUp(ctx, c)
go func() {
c.initAppWG.Wait()
c.compareAndSwapHealthStatus(control.HealthStatus_STARTING, control.HealthStatus_READY)
}()
c.compareAndSwapHealthStatus(control.HealthStatus_STARTING, control.HealthStatus_READY)
wait(c)
}
@ -147,16 +144,7 @@ func stopAndLog(c *cfg, name string, stopper func() error) {
func bootUp(ctx context.Context, c *cfg) {
runAndLog(ctx, c, "NATS", true, connectNats)
runAndLog(ctx, c, "gRPC", false, func(_ context.Context, c *cfg) { serveGRPC(c) })
// It may happen that boot-up waits for the execution of a notary deposit transaction
// and waiting loop may hang for an indefinite time. In this case, we need to let
// frostfs-node go on initialization, although its functionality will be available partially.
// That's why makeAndWaitNotaryDeposit is run asynchroniosly.
c.initAppWG.Add(1)
c.workers = append(c.workers, newWorkerFromFunc(func(ctx context.Context) {
defer c.initAppWG.Done()
runAndLog(ctx, c, "notary", true, makeAndWaitNotaryDeposit)
}))
runAndLog(ctx, c, "notary", true, makeAndWaitNotaryDeposit)
bootstrapNode(c)
startWorkers(ctx, c)

2
cmd/frostfs-node/morph.go
View File

@ -158,7 +158,6 @@ var (
func waitNotaryDeposit(ctx context.Context, c *cfg, tx util.Uint256) error {
for i := 0; i < notaryDepositRetriesAmount; i++ {
c.log.Debug(logs.ClientAttemptToWaitForNotaryDepositTransactionToGetPersisted)
select {
case <-ctx.Done():
return ctx.Err()
@ -168,7 +167,6 @@ func waitNotaryDeposit(ctx context.Context, c *cfg, tx util.Uint256) error {
ok, err := c.cfgMorph.client.TxHalt(tx)
if err == nil {
if ok {
c.log.Info(logs.ClientNotaryDepositTransactionWasSuccessfullyPersisted)
return nil
}

2
internal/logs/logs.go
View File

@ -158,8 +158,6 @@ const (
ClientNotaryDepositInvoke = "notary deposit invoke"
ClientNotaryRequestWithPreparedMainTXInvoked = "notary request with prepared main TX invoked"
ClientNotaryRequestInvoked = "notary request invoked"
ClientNotaryDepositTransactionWasSuccessfullyPersisted = "notary deposit transaction was successfully persisted"
ClientAttemptToWaitForNotaryDepositTransactionToGetPersisted = "attempt to wait for notary deposit transaction to get persisted"
ClientNeoClientInvoke = "neo client invoke"
ClientNativeGasTransferInvoke = "native gas transfer invoke"
ClientBatchGasTransferInvoke = "batch gas transfer invoke"