Nodes now need a setup step before running.

node/src/main/kotlin/com/r3corda/node/internal/AbstractNode.kt

@@ -121,8 +121,6 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration,
         require(!started) { "Node has already been started" }
         log.info("Node starting up ...")
 
-        createNodeDir()
-
         val storageServices = initialiseStorageService(dir)
         storage = storageServices.first
         checkpointStorage = storageServices.second
@@ -154,6 +152,14 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration,
         return this
     }
 
+    /**
+     * Run any tasks that are needed to ensure the node is in a correct state before running start()
+     */
+    open fun setup(): AbstractNode {
+        createNodeDir()
+        return this
+    }
+
     private fun buildAdvertisedServices() {
         val serviceTypes = info.advertisedServices
         if (NetworkMapService.Type in serviceTypes) makeNetworkMapService()
@@ -319,7 +325,7 @@ abstract class AbstractNode(val dir: Path, val configuration: NodeConfiguration,
         return NodeAttachmentService(attachmentsDir, services.monitoringService.metrics)
     }
 
-    private fun createNodeDir() {
+    protected fun createNodeDir() {
         if (!Files.exists(dir)) {
             Files.createDirectories(dir)
         }

node/src/main/kotlin/com/r3corda/node/internal/Node.kt

@@ -153,6 +153,11 @@ class Node(dir: Path, val p2pAddr: HostAndPort, configuration: NodeConfiguration
         return this
     }
 
+    override fun setup(): Node {
+        super.setup()
+        return this
+    }
+
     override fun stop() {
         webServer.stop()
         super.stop()
@@ -165,24 +170,23 @@ class Node(dir: Path, val p2pAddr: HostAndPort, configuration: NodeConfiguration
         // file that we'll do our best to delete on exit. But if we don't, it'll be overwritten next time. If it already
         // exists, we try to take the file lock first before replacing it and if that fails it means we're being started
         // twice with the same directory: that's a user error and we should bail out.
-        if(Files.exists(dir)) {
-            val pidPath = dir.resolve("process-id")
-            val file = pidPath.toFile()
-            if (!file.exists()) {
-                file.createNewFile()
-            }
-            file.deleteOnExit()
-            val f = RandomAccessFile(file, "rw")
-            val l = f.channel.tryLock()
-            if (l == null) {
-                println("It appears there is already a node running with the specified data directory $dir")
-                println("Shut that other node down and try again. It may have process ID ${file.readText()}")
-                System.exit(1)
-            }
-            nodeFileLock = l
-            val ourProcessID: String = ManagementFactory.getRuntimeMXBean().name.split("@")[0]
-            f.setLength(0)
-            f.write(ourProcessID.toByteArray())
+        val pidPath = dir.resolve("process-id")
+        val file = pidPath.toFile()
+        if (!file.exists()) {
+            file.createNewFile()
         }
+        file.deleteOnExit()
+        val f = RandomAccessFile(file, "rw")
+        val l = f.channel.tryLock()
+        if (l == null) {
+            println("It appears there is already a node running with the specified data directory $dir")
+            println("Shut that other node down and try again. It may have process ID ${file.readText()}")
+            System.exit(1)
+        }
+
+        nodeFileLock = l
+        val ourProcessID: String = ManagementFactory.getRuntimeMXBean().name.split("@")[0]
+        f.setLength(0)
+        f.write(ourProcessID.toByteArray())
      }
 }

node/src/main/kotlin/com/r3corda/node/internal/testing/MockNode.kt

@@ -121,7 +121,7 @@ class MockNetwork(private val threadPerNode: Boolean = false,
             override val nearestCity: String = "Atlantis"
         }
         val node = nodeFactory.create(path, config, this, networkMapAddress, advertisedServices.toSet(), id, keyPair)
-        if (start) node.start()
+        if (start) node.setup().start()
         _nodes.add(node)
         return node
     }

src/main/kotlin/com/r3corda/demos/IRSDemo.kt

@@ -401,7 +401,7 @@ private fun startNode(params : NodeParams) : Node {
 
     val node = logElapsedTime("Node startup") { Node(params.dir, myNetAddr, config, networkMapId,
             advertisedServices, DemoClock(),
-            listOf(InterestRateSwapAPI::class.java)).start() }
+            listOf(InterestRateSwapAPI::class.java)).setup().start() }
 
     // TODO: This should all be replaced by the identity service being updated
     // as the network map changes.

src/main/kotlin/com/r3corda/demos/RateFixDemo.kt

@@ -75,7 +75,7 @@ fun main(args: Array<String>) {
 
     val node = logElapsedTime("Node startup") { Node(dir, myNetAddr, config, networkMapAddress,
             advertisedServices, DemoClock(),
-            listOf(InterestRateSwapAPI::class.java)).start() }
+            listOf(InterestRateSwapAPI::class.java)).setup().start() }
 
     val notary = node.services.networkMapCache.notaryNodes[0]
 

src/main/kotlin/com/r3corda/demos/TraderDemo.kt

@@ -129,7 +129,7 @@ fun main(args: Array<String>) {
 
     // And now construct then start the node object. It takes a little while.
     val node = logElapsedTime("Node startup") {
-        Node(directory, myNetAddr, config, networkMapId, advertisedServices).start()
+        Node(directory, myNetAddr, config, networkMapId, advertisedServices).setup().start()
     }
 
     // What happens next depends on the role. The buyer sits around waiting for a trade to start. The seller role