wait for lock to be acquired

Author: Cory Schwartz

cmd/filecoin-chain-archiver/cmds/locker.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/filecoin-project/go-jsonrpc"
-	"github.com/filecoin-project/lotus/cli/util"
+	cliutil "github.com/filecoin-project/lotus/cli/util"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/xerrors"
 
@@ -87,8 +87,14 @@ var cmdService = &cli.Command{
 				},
 				{
 					Name:  "lock",
-					Usage: "list current locks",
-					Flags: []cli.Flag{},
+					Usage: "acquire a lock",
+					Flags: []cli.Flag{
+						&cli.BoolFlag{
+							Name:    "wait",
+							Aliases: []string{"w"},
+							Value:   false,
+						},
+					},
 					Action: func(cctx *cli.Context) error {
 						ctx := context.Background()
 
@@ -98,17 +104,20 @@ var cmdService = &cli.Command{
 							return err
 						}
 
-						fmt.Println(cctx.Args().Get(0))
-						fmt.Println(cctx.Args().Get(1))
-
-						lock, err := api.Lock(ctx, cctx.Args().Get(0), cctx.Args().Get(1))
-						if err != nil {
-							return err
+						for {
+							lock, err := api.Lock(ctx, cctx.Args().Get(0), cctx.Args().Get(1))
+							if err != nil {
+								return err
+							}
+							fmt.Printf("peerid:%s, acquired:%t, expiry:%s\n", lock.PeerID, lock.Acquired, lock.Expiry)
+							if lock.Acquired {
+								return nil
+							} else if !lock.Acquired && !cctx.Bool("wait") {
+								err = fmt.Errorf("lock not aquired")
+								return err
+							}
+							time.Sleep(10 * time.Second)
 						}
-
-						fmt.Printf("%s, %T, %s", lock.PeerID, lock.Aquired, lock.Expiry)
-
-						return nil
 					},
 				},
 				{

pkg/nodelocker/client/nodelocker.go

@@ -5,9 +5,9 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/filecoin-project/lotus/cli/util"
 	"github.com/filecoin-project/filecoin-chain-archiver/pkg/nodelocker"
 	"github.com/filecoin-project/filecoin-chain-archiver/pkg/nodelocker/api/apiclient"
+	cliutil "github.com/filecoin-project/lotus/cli/util"
 )
 
 const charset = "abcdefghijklmnopqrstuvwxyz"
@@ -46,7 +46,7 @@ func (nl *NodeLock) Renew(ctx context.Context) (bool, error) {
 
 	nl.expiry = lock.Expiry
 
-	return lock.Aquired, nil
+	return lock.Acquired, nil
 }
 
 func (nl *NodeLock) Expiry() time.Time {

pkg/nodelocker/nodelocker.go

@@ -12,9 +12,9 @@ import (
 var logger = log.Logger("filecoin-chain-archiver/pkg/nodelocker")
 
 type NodeLock struct {
-	PeerID  string
-	Expiry  time.Time
-	Aquired bool
+	PeerID   string
+	Expiry   time.Time
+	Acquired bool
 }
 
 type nodeLock struct {
@@ -59,9 +59,9 @@ func (snl *NodeLocker) FetchLocks(ctx context.Context) ([]NodeLock, error) {
 	for e := snl.locks.Front(); e != nil; e = e.Next() {
 		lock := e.Value.(nodeLock)
 		locks = append(locks, NodeLock{
-			PeerID:  lock.peerID,
-			Expiry:  lock.expiry,
-			Aquired: true,
+			PeerID:   lock.peerID,
+			Expiry:   lock.expiry,
+			Acquired: true,
 		})
 	}
 
@@ -86,16 +86,16 @@ func (snl *NodeLocker) Lock(ctx context.Context, peerID, secret string) (NodeLoc
 
 				logger.Infow("updated lock", "expiry", lock.expiry, "peer", lock.peerID, "secret", lock.secret)
 				return NodeLock{
-					PeerID:  lock.peerID,
-					Expiry:  lock.expiry,
-					Aquired: true,
+					PeerID:   lock.peerID,
+					Expiry:   lock.expiry,
+					Acquired: true,
 				}, nil
 			} else {
 				logger.Infow("lock failed", "expiry", lock.expiry, "peer", lock.peerID, "secret", lock.secret)
 				return NodeLock{
-					PeerID:  lock.peerID,
-					Expiry:  lock.expiry,
-					Aquired: false,
+					PeerID:   lock.peerID,
+					Expiry:   lock.expiry,
+					Acquired: false,
 				}, nil
 			}
 		}
@@ -112,8 +112,8 @@ func (snl *NodeLocker) Lock(ctx context.Context, peerID, secret string) (NodeLoc
 	snl.locks.PushBack(lock)
 
 	return NodeLock{
-		PeerID:  lock.peerID,
-		Expiry:  lock.expiry,
-		Aquired: true,
+		PeerID:   lock.peerID,
+		Expiry:   lock.expiry,
+		Acquired: true,
 	}, nil
 }