From 3be251005a0e2d0272176ae48a0fb6cf0c9a7312 Mon Sep 17 00:00:00 2001 From: Andrzej Cichocki Date: Wed, 27 Sep 2017 17:25:46 +0100 Subject: [PATCH] CORDA-642 Notary demo documentation fixes (#1682) * Notary demo documentation fixes. * One of the tables is prefixed. --- build.gradle | 2 +- docs/source/running-the-demos.rst | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 5ce4d1459c..023023eaff 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ buildscript { ext.jopt_simple_version = '5.0.2' ext.jansi_version = '1.14' ext.hibernate_version = '5.2.6.Final' - ext.h2_version = '1.4.194' + ext.h2_version = '1.4.194' // Update docs if renamed or removed. ext.rxjava_version = '1.2.4' ext.dokka_version = '0.9.14' ext.eddsa_version = '0.2.0' diff --git a/docs/source/running-the-demos.rst b/docs/source/running-the-demos.rst index a20990dab9..83cf6e782f 100644 --- a/docs/source/running-the-demos.rst +++ b/docs/source/running-the-demos.rst @@ -138,19 +138,18 @@ To run from the command line in Windows: To run the BFT SMaRt notary demo, use ``nodesBFT`` instead of ``nodesRaft`` in the path (you will see messages from notary nodes trying to communicate each other sometime with connection errors, that's normal). For a single notary node, use ``nodesSingle``. -Notary nodes store consumed states in a replicated commit log, which is backed by a H2 database on each node. +Distributed notary nodes store consumed states in a replicated commit log, which is backed by a H2 database on each node. You can ascertain that the commit log is synchronised across the cluster by accessing and comparing each of the nodes' backing stores by using the H2 web console: - Firstly, download `H2 web console `_ (download the "platform-independent zip"), - and start it using a script in the extracted folder: ``h2/bin/h2.sh`` (or ``h2\bin\h2`` for Windows) + and start it using a script in the extracted folder: ``sh h2/bin/h2.sh`` (or ``h2\bin\h2`` for Windows) - If you are uncertain as to which version of h2 to install or if you have connectivity issues, refer to ``build.gradle`` - located in the ``node`` directory and locate the compile step for ``com.h2database``. Use a client of the same - major version - even if still in beta. + located in the corda directory and locate ``h2_version``. Use a client of the same major version - even if still in beta. - The H2 web console should start up in a web browser tab. To connect we first need to obtain a JDBC connection string. - Each node outputs its connection string in the terminal window as it starts up. In a terminal window where a node is running, + Each node outputs its connection string in the terminal window as it starts up. In a terminal window where a **notary** node is running, look for the following string: ``Database connection url is : jdbc:h2:tcp://10.18.0.150:56736/node`` @@ -158,8 +157,8 @@ by using the H2 web console: You can use the string on the right to connect to the h2 database: just paste it into the `JDBC URL` field and click *Connect*. You will be presented with a web application that enumerates all the available tables and provides an interface for you to query them using SQL -- The committed states are stored in the ``NOTARY_COMMITTED_STATES`` table. Note that the raw data is not human-readable, - but we're only interested in the row count for this demo +- The committed states are stored in the ``NOTARY_COMMITTED_STATES`` table (for Raft) or ``NODE_BFT_SMART_NOTARY_COMMITTED_STATES`` (for BFT). + Note that in the Raft case the raw data is not human-readable, but we're only interested in the row count for this demo Bank Of Corda demo ------------------