- Added beacon node db file locks

- minor fixes

Author: pmmiranda

nimbus/consensus/wrapper_consensus.nim

@@ -8,7 +8,7 @@
 {.push raises: [].}
 
 import
-  std/[os, random, terminal, times, exitprocs],
+  std/[os, random, terminal, times, exitprocs, atomics],
   chronos,
   chronicles,
   metrics,
@@ -2295,12 +2295,17 @@ proc run(node: BeaconNode) {.raises: [CatchableError].} =
   # time to say goodbye
   node.stop()
 
+# db lock
+var shouldCreatePid*: Atomic[bool]
+shouldCreatePid.store(true)
+
 var gPidFile: string
 proc createPidFile(filename: string) {.raises: [IOError].} =
-  writeFile filename, $os.getCurrentProcessId()
-  gPidFile = filename
-  addExitProc proc() {.noconv.} =
-    discard io2.removeFile(gPidFile)
+  if shouldCreatePid.load():
+    writeFile filename, $os.getCurrentProcessId()
+    gPidFile = filename
+    addExitProc proc() {.noconv.} =
+      discard io2.removeFile(gPidFile)
 
 proc initializeNetworking(node: BeaconNode) {.async.} =
   node.installMessageValidators()

nimbus/execution/execution_layer.nim

@@ -20,7 +20,7 @@ import
 logScope:
   topics = "Execution layer"
 
-var nimbusHandler = NimbusNode()
+var nimbusHandler: NimbusNode
 
 proc shutdownExecution*() =
   nimbusHandler.state = NimbusState.Stopping

nimbus/nimbus.nim

@@ -5,21 +5,37 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
+{.push raises: [].}
+
 import
-  std/[concurrency/atomics, os],
+  std/[concurrency/atomics, os, exitprocs],
   chronicles,
   execution/execution_layer,
-  consensus/consensus_layer,
+  consensus/[consensus_layer, wrapper_consensus],
   common/utils,
   conf,
   confutils/cli_parser,
+  stew/io2,
   beacon_chain/conf,
   ../execution_chain/config
 
 # ------------------------------------------------------------------------------
 # Private
 # ------------------------------------------------------------------------------
 
+#beacon node db lock
+var beaconNodeLock {.global.}: string
+
+proc createBeaconNodeFileLock(filename: string) {.raises: [IOError].} =
+  shouldCreatePid.store(false)
+
+  writeFile filename, $os.getCurrentProcessId()
+  beaconNodeLock = filename
+
+  addExitProc proc() {.noconv.} =
+    if beaconNodeLock.len > 0:
+      discard io2.removeFile(beaconNodeLock)
+
 ## create and configure service
 proc startService(nimbus: var Nimbus, service: var NimbusService) =
   #channel creation (shared memory)
@@ -32,7 +48,10 @@ proc startService(nimbus: var Nimbus, service: var NimbusService) =
   isConfigRead.store(false)
 
   #start thread
-  createThread(service.serviceHandler, service.serviceFunc, serviceChannel)
+  try:
+    createThread(service.serviceHandler, service.serviceFunc, serviceChannel)
+  except Exception as e:
+    fatal "error creating thread", err = e.msg
 
   let optionsTable = block:
     case service.layerConfig.kind
@@ -64,7 +83,10 @@ proc startService(nimbus: var Nimbus, service: var NimbusService) =
     writeConfigString(writeOffset, opt)
     writeConfigString(writeOffset, arg)
 
-  serviceChannel[].send(byteArray)
+  try:
+    serviceChannel[].send(byteArray)
+  except Exception as e:
+    fatal "channel error: ", err = e.msg
 
   #wait for service read ack
   while not isConfigRead.load():
@@ -115,19 +137,15 @@ proc controlCHandler() {.noconv.} =
 
   notice "\tCtrl+C pressed. Shutting down services ..."
 
-  # WA to shutdown client(exceptions thrown)
-  # issues related with nat.nim shutdown procedure (nim-eth
-  quit 0
-
   shutdownExecution()
   shutdownConsensus()
 
 # ------------------------------------------------------------------------------
 # Public
 # ------------------------------------------------------------------------------
 
-# Setup services
-proc setup*(nimbus: var Nimbus) =
+# Setup nimbus and services
+proc setup(nimbus: var Nimbus) {.raises: [CatchableError].} =
   let
     executionConfigNames = extractFieldNames(NimbusConf)
     consensusConfigNames = extractFieldNames(BeaconNodeConf)
@@ -164,6 +182,9 @@ proc setup*(nimbus: var Nimbus) =
   nimbus.serviceList.add(executionService)
   nimbus.serviceList.add(consensusService)
 
+  # todo: replace path with config,datadir when creating Nimbus config
+  createBeaconNodeFileLock(".beacon_node.pid")
+
 ## start nimbus client
 proc run*(nimbus: var Nimbus) =
   try:
@@ -181,12 +202,17 @@ proc run*(nimbus: var Nimbus) =
   # wait for shutdown
   nimbus.monitorServices()
 
-# ------
+{.pop.}
+# -----
+
 when isMainModule:
   notice "Starting Nimbus"
 
   setupFileLimits()
 
+  # todo: replace path with config after creating Nimbus config
+  # setupLogging(config.logLevel, config.logStdout, config.logFile)
+
   var nimbus = Nimbus()
   nimbus.setup()
   nimbus.run()