In the installation guide, use datanode names that are consistent with what we

use in regression tests, for sanity.

diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 2c5dd9cb1caf53e5e3b3e69dc801b1c76cedbb96..af10165adeaadac363a09f5204665f2e9afe9dbb 100644 (file)
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -42,34 +42,34 @@ su
 gmake install
 adduser postgres
 mkdir /usr/local/pgsql/data_coord1
-mkdir /usr/local/pgsql/data_datanode1
-mkdir /usr/local/pgsql/data_datanode2
+mkdir /usr/local/pgsql/data_datanode_1
+mkdir /usr/local/pgsql/data_datanode_2
 mkdir /usr/local/pgsql/data_gtm
 chown postgres /usr/local/pgsql/data_coord1
-chown postgres /usr/local/pgsql/data_datanode1
-chown postgres /usr/local/pgsql/data_datanode2
+chown postgres /usr/local/pgsql/data_datanode_1
+chown postgres /usr/local/pgsql/data_datanode_2
 chown postgres /usr/local/pgsql/data_gtm
 su - postgres
 /usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data_coord1 --nodename coord1
-/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data_datanode1 --nodename datanode1
-/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data_datanode2 --nodename datanode2
+/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data_datanode_1 --nodename datanode_1
+/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data_datanode_2 --nodename datanode_2
 /usr/local/pgsql/bin/initgtm -D /usr/local/pgsql/data_gtm -Z gtm
 /usr/local/pgsql/bin/gtm -D /usr/local/pgsql/data_gtm >logfile 2>&1 &
-/usr/local/pgsql/bin/postgres --datanode -p 15432 -c pooler_port=40101 -D /usr/local/pgsql/data_datanode1 >logfile 2>&1 &
-/usr/local/pgsql/bin/postgres --datanode -p 15433 -c pooler_port=40102 -D /usr/local/pgsql/data_datanode2 >logfile 2>&1 &
+/usr/local/pgsql/bin/postgres --datanode -p 15432 -c pooler_port=40101 -D /usr/local/pgsql/data_datanode_1 >logfile 2>&1 &
+/usr/local/pgsql/bin/postgres --datanode -p 15433 -c pooler_port=40102 -D /usr/local/pgsql/data_datanode_2 >logfile 2>&1 &
 /usr/local/pgsql/bin/postgres --coordinator -c pooler_port=40100 -D /usr/local/pgsql/data_coord1 >logfile 2>&1 &
 /usr/local/pgsql/bin/psql -c "ALTER NODE coord1 WITH (TYPE = 'coordinator', PORT = 5432)" postgres
-/usr/local/pgsql/bin/psql -c "CREATE NODE datanode1 WITH (TYPE = 'datanode', PORT = 15432)" postgres
-/usr/local/pgsql/bin/psql -c "CREATE NODE datanode2 WITH (TYPE = 'datanode', PORT = 15433)" postgres
-/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode1) 'ALTER NODE datanode1 WITH (TYPE = ''datanode'', PORT = 15432)'" postgres
-/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode1) 'CREATE NODE datanode2 WITH (TYPE = ''datanode'', PORT = 15433)'" postgres
-/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode1) 'CREATE NODE coord1 WITH (TYPE = ''coordinator'', PORT = 5432)'" postgres
-/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode2) 'ALTER NODE datanode2 WITH (TYPE = ''datanode'', PORT = 15433)'" postgres
-/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode2) 'CREATE NODE datanode1 WITH (TYPE = ''datanode'', PORT = 15432)'" postgres
-/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode2) 'CREATE NODE coord1 WITH (TYPE = ''coordinator'', PORT = 5432)'" postgres
+/usr/local/pgsql/bin/psql -c "CREATE NODE datanode_1 WITH (TYPE = 'datanode', PORT = 15432)" postgres
+/usr/local/pgsql/bin/psql -c "CREATE NODE datanode_2 WITH (TYPE = 'datanode', PORT = 15433)" postgres
+/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode_1) 'ALTER NODE datanode_1 WITH (TYPE = ''datanode'', PORT = 15432)'" postgres
+/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode_1) 'CREATE NODE datanode_2 WITH (TYPE = ''datanode'', PORT = 15433)'" postgres
+/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode_1) 'CREATE NODE coord1 WITH (TYPE = ''coordinator'', PORT = 5432)'" postgres
+/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode_2) 'ALTER NODE datanode_2 WITH (TYPE = ''datanode'', PORT = 15433)'" postgres
+/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode_2) 'CREATE NODE datanode_1 WITH (TYPE = ''datanode'', PORT = 15432)'" postgres
+/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode_2) 'CREATE NODE coord1 WITH (TYPE = ''coordinator'', PORT = 5432)'" postgres
 /usr/local/pgsql/bin/psql -c "SELECT pgxc_pool_reload()" postgres
-/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode1) 'SELECT pgxc_pool_reload()'" postgres
-/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode2) 'SELECT pgxc_pool_reload()'" postgres
+/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode_1) 'SELECT pgxc_pool_reload()'" postgres
+/usr/local/pgsql/bin/psql -c "EXECUTE DIRECT ON (datanode_2) 'SELECT pgxc_pool_reload()'" postgres
 /usr/local/pgsql/bin/createdb test
 /usr/local/pgsql/bin/psql test
 </synopsis>