Revert "cmd: allow file descriptor limit to be set via CLI (#24477)"

This reverts commit 2bca180.

cmd/geth/main.go

@@ -127,7 +127,6 @@ var (
 		utils.CacheGCFlag,
 		utils.CacheSnapshotFlag,
 		utils.CachePreimagesFlag,
-		utils.FDLimitFlag,
 		utils.PersistDiffFlag,
 		utils.DiffBlockFlag,
 		utils.PruneAncientDataFlag,

cmd/geth/snapshot.go

@@ -109,7 +109,7 @@ the trie clean cache with default directory will be deleted.
 geth offline prune-block for block data in ancientdb.
 The amount of blocks expected for remaining after prune can be specified via block-amount-reserved in this command,
 will prune and only remain the specified amount of old block data in ancientdb.
-the brief workflow is to backup the the number of this specified amount blocks backward in original ancientdb
+the brief workflow is to backup the the number of this specified amount blocks backward in original ancientdb 
 into new ancient_backup, then delete the original ancientdb dir and rename the ancient_backup to original one for replacement,
 finally assemble the statedb and new ancientDb together.
 The purpose of doing it is because the block data will be moved into the ancient store when it
@@ -154,7 +154,7 @@ In other words, this command does the snapshot to trie conversion.
 				},
 				Description: `
 will prune all historical trie state data except genesis block.
-All trie nodes will be deleted from the database.
+All trie nodes will be deleted from the database. 
 
 It expects the genesis file as argument.
 
@@ -206,7 +206,7 @@ geth snapshot traverse-rawstate <state-root>
 will traverse the whole state from the given root and will abort if any referenced
 trie node or contract code is missing. This command can be used for state integrity
 verification. The default checking target is the HEAD state. It's basically identical
-to traverse-state, but the check granularity is smaller.
+to traverse-state, but the check granularity is smaller. 
 
 It's also usable without snapshot enabled.
 `,
@@ -232,7 +232,7 @@ It's also usable without snapshot enabled.
 				},
 				Description: `
 This command is semantically equivalent to 'geth dump', but uses the snapshots
-as the backend data source, making this command a lot faster.
+as the backend data source, making this command a lot faster. 
 
 The argument is interpreted as block number or hash. If none is provided, the latest
 block is used.
@@ -390,7 +390,7 @@ func pruneBlock(ctx *cli.Context) error {
 	if exist {
 		defer lock.Release()
 		log.Info("file lock existed, waiting for prune recovery and continue", "err", err)
-		if err := blockpruner.RecoverInterruption("chaindata", config.Eth.DatabaseCache, utils.MakeDatabaseHandles(ctx.GlobalInt(utils.FDLimitFlag.Name)), "", false); err != nil {
+		if err := blockpruner.RecoverInterruption("chaindata", config.Eth.DatabaseCache, utils.MakeDatabaseHandles(), "", false); err != nil {
 			log.Error("Pruning failed", "err", err)
 			return err
 		}
@@ -409,7 +409,7 @@ func pruneBlock(ctx *cli.Context) error {
 		return nil
 	}
 	name := "chaindata"
-	if err := blockpruner.BlockPruneBackUp(name, config.Eth.DatabaseCache, utils.MakeDatabaseHandles(ctx.GlobalInt(utils.FDLimitFlag.Name)), "", false, false); err != nil {
+	if err := blockpruner.BlockPruneBackUp(name, config.Eth.DatabaseCache, utils.MakeDatabaseHandles(), "", false, false); err != nil {
 		log.Error("Failed to back up block", "err", err)
 		return err
 	}

cmd/geth/usage.go

@@ -128,7 +128,6 @@ var AppHelpFlagGroups = []flags.FlagGroup{
 			utils.CacheGCFlag,
 			utils.CacheSnapshotFlag,
 			utils.CachePreimagesFlag,
-			utils.FDLimitFlag,
 		},
 	},
 	{

cmd/utils/flags.go

@@ -296,12 +296,12 @@ var (
 	defaultVerifyMode   = ethconfig.Defaults.TriesVerifyMode
 	TriesVerifyModeFlag = TextMarshalerFlag{
 		Name: "tries-verify-mode",
-		Usage: `tries verify mode:
-				"local(default): a normal full node with complete state world(both MPT and snapshot), merkle state root will
-				                 be verified against the block header.",
-				"full: a fast node with only snapshot state world. Merkle state root is verified by the trustworthy remote verify node
-					   by comparing the diffhash(an identify of difflayer generated by the block) and state root.",
-				"insecure: same as full mode, except that it can tolerate without verifying the diffhash when verify node does not have it.",
+		Usage: `tries verify mode: 
+				"local(default): a normal full node with complete state world(both MPT and snapshot), merkle state root will 
+				                 be verified against the block header.", 
+				"full: a fast node with only snapshot state world. Merkle state root is verified by the trustworthy remote verify node 
+					   by comparing the diffhash(an identify of difflayer generated by the block) and state root.", 
+				"insecure: same as full mode, except that it can tolerate without verifying the diffhash when verify node does not have it.", 
 				"none: no merkle state root verification at all, there is no need to setup or connect remote verify node at all,
 				       it is more light comparing to full and insecure mode, but get a very small chance that the state is not consistent
 						with other peers."`,
@@ -504,10 +504,6 @@ var (
 		Name:  "pruneancient",
 		Usage: "Prune ancient data, recommends to the user who don't care about the ancient data. Note that once be turned on, the ancient data will not be recovered again",
 	}
-	FDLimitFlag = cli.IntFlag{
-		Name:  "fdlimit",
-		Usage: "Raise the open file descriptor resource limit (default = system fd limit)",
-	}
 	// Miner settings
 	MiningEnabledFlag = cli.BoolFlag{
 		Name:  "mine",
@@ -1171,24 +1167,11 @@ func setLes(ctx *cli.Context, cfg *ethconfig.Config) {
 
 // MakeDatabaseHandles raises out the number of allowed file handles per process
 // for Geth and returns half of the allowance to assign to the database.
-func MakeDatabaseHandles(max int) int {
+func MakeDatabaseHandles() int {
 	limit, err := fdlimit.Maximum()
 	if err != nil {
 		Fatalf("Failed to retrieve file descriptor allowance: %v", err)
 	}
-	switch {
-	case max == 0:
-		// User didn't specify a meaningful value, use system limits
-	case max < 128:
-		// User specified something unhealthy, just use system defaults
-		log.Error("File descriptor limit invalid (<128)", "had", max, "updated", limit)
-	case max > limit:
-		// User requested more than the OS allows, notify that we can't allocate it
-		log.Warn("Requested file descriptors denied by OS", "req", max, "limit", limit)
-	default:
-		// User limit is meaningful and within allowed range, use that
-		limit = max
-	}
 	raised, err := fdlimit.Raise(uint64(limit))
 	if err != nil {
 		Fatalf("Failed to raise file descriptor allowance: %v", err)
@@ -1664,7 +1647,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 	if ctx.GlobalIsSet(CacheFlag.Name) || ctx.GlobalIsSet(CacheDatabaseFlag.Name) {
 		cfg.DatabaseCache = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheDatabaseFlag.Name) / 100
 	}
-	cfg.DatabaseHandles = MakeDatabaseHandles(ctx.GlobalInt(FDLimitFlag.Name))
+	cfg.DatabaseHandles = MakeDatabaseHandles()
 	if ctx.GlobalIsSet(AncientFlag.Name) {
 		cfg.DatabaseFreezer = ctx.GlobalString(AncientFlag.Name)
 	}
@@ -2027,7 +2010,7 @@ func SplitTagsFlag(tagsFlag string) map[string]string {
 func MakeChainDatabase(ctx *cli.Context, stack *node.Node, readonly, disableFreeze bool) ethdb.Database {
 	var (
 		cache   = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheDatabaseFlag.Name) / 100
-		handles = MakeDatabaseHandles(ctx.GlobalInt(FDLimitFlag.Name))
+		handles = MakeDatabaseHandles()
 
 		err     error
 		chainDb ethdb.Database