fix(flag): fix bulk loader flag and remove flag parsing from critical…

… path (#7679)

dgraph/cmd/alpha/run.go

@@ -716,6 +716,7 @@ func run() {
 		HmacSecret:          opts.HmacSecret,
 		Audit:               opts.Audit != nil,
 		Badger:              badger,
+		MaxRetries:          badger.GetInt64("max-retries"),
 	}
 	x.WorkerConfig.Parse(Alpha.Conf)
 

dgraph/cmd/bulk/run.go

@@ -48,7 +48,7 @@ var Bulk x.SubCommand
 var defaultOutDir = "./out"
 
 const BulkBadgerDefaults = "compression=snappy; goroutines=8;" +
-	" cache_mb=64; cache_percentage=70,30;"
+	" cache-mb=64; cache-percentage=70,30;"
 
 func init() {
 	Bulk.Cmd = &cobra.Command{

worker/draft.go

@@ -778,7 +778,7 @@ func (n *node) commitOrAbort(pkey uint64, delta *pb.OracleDelta) error {
 			return
 		}
 		txn.Update()
-		err := x.RetryUntilSuccess(int(x.WorkerConfig.Badger.GetInt64("max-retries")),
+		err := x.RetryUntilSuccess(int(x.WorkerConfig.MaxRetries),
 			10*time.Millisecond, func() error {
 				err := txn.CommitToDisk(writer, commit)
 				if err == badger.ErrBannedKey {

x/config.go

@@ -108,6 +108,9 @@ type WorkerOptions struct {
 	HmacSecret Sensitive
 	// AbortOlderThan tells Dgraph to discard transactions that are older than this duration.
 	AbortOlderThan time.Duration
+	// MaxRetries indicates the number of retries Dgraph do to prevent locking the worker in a
+	// failed state.
+	MaxRetries int64
 	// ProposedGroupId will be used if there's a file in the p directory called group_id with the
 	// proposed group ID for this server.
 	ProposedGroupId uint32