removing other broken references to start-single-node. deprecating OLTP-Bench example

Author: timveil

README.md

@@ -9,7 +9,7 @@
 * [HAProxy Example with Workload](example-haproxy-with-workload/README.md) - Simple 3 node cluster with `HAProxy` as the load balancer and a `client` node running the `tpcc` workload
 * [Enterprise Backup Example](example-enterprise-backup/README.md) - CockroachDB Enterprise `BACKUP` to `NGINX` based "File Server"
 * [YCSB Functional Example](example-ycsb/README.md) - Building and running [YCSB](https://github.com/brianfrankcooper/YCSB) against a 3 node CockroachDB cluster
-* [OLTPBench Functional Example](example-oltpbench/README.md) - Building and running a fork of [OLTPBench](https://github.com/timveil-cockroach/oltpbench) against a 3 node CockroachDB cluster
+* [OLTPBench Functional Example](example-oltpbench/README.md) - [DEPRECATED] Building and running a fork of [OLTPBench](https://github.com/timveil-cockroach/oltpbench) against a 3 node CockroachDB cluster 
 * [Netflix Genie Metastore Example](example-netflix-genie) - Example using CockroachDB as the metastore for [Netflix Genie](https://github.com/Netflix/genie)
 * [Apache Druid Metastore Example](example-apache-druid) - Example using CockroachDB as the metastore for [Apache Druid](https://druid.apache.org/docs/latest/design/index.html)
 

example-enterprise-backup/docker-compose.yml

@@ -9,7 +9,7 @@ services:
     container_name: crdb-0
     hostname: crdb-0
     image: cockroachdb/cockroach:latest
-    command: start-single-node --cluster-name=example-enterprise-backup --logtostderr=WARNING --log-file-verbosity=WARNING --insecure
+    command: start --cluster-name=example-enterprise-backup --logtostderr=WARNING --log-file-verbosity=WARNING --insecure --join=crdb-0
 
   crdb-1:
     container_name: crdb-1
@@ -42,6 +42,18 @@ services:
       - crdb-1
       - crdb-2
 
+  crdb-init:
+    container_name: crdb-init
+    hostname: crdb-init
+    image: timveil/cockroachdb-remote-client:latest
+    environment:
+      - COCKROACH_HOST=crdb-0:26257
+      - COCKROACH_INSECURE=true
+      - COCKROACH_INIT=true
+      - DATABASE_NAME=test
+    depends_on:
+      - lb
+
   fileserver:
     container_name: fileserver
     hostname: fileserver

example-nginx/docker-compose.yml

@@ -6,7 +6,7 @@ services:
     container_name: crdb-0
     hostname: crdb-0
     image: cockroachdb/cockroach:latest
-    command: start-single-node --cluster-name=example-nginx --logtostderr=WARNING --log-file-verbosity=WARNING --insecure
+    command: start --cluster-name=example-nginx --logtostderr=WARNING --log-file-verbosity=WARNING --insecure --join=crdb-0
 
   crdb-1:
     container_name: crdb-1
@@ -34,4 +34,16 @@ services:
     depends_on:
       - crdb-0
       - crdb-1
-      - crdb-2
+      - crdb-2
+
+  crdb-init:
+    container_name: crdb-init
+    hostname: crdb-init
+    image: timveil/cockroachdb-remote-client:latest
+    environment:
+      - COCKROACH_HOST=crdb-0:26257
+      - COCKROACH_INSECURE=true
+      - COCKROACH_INIT=true
+      - DATABASE_NAME=test
+    depends_on:
+      - lb

example-oltpbench/README.md

@@ -1,4 +1,7 @@
-# Running OLTP-Bench Suite Fork
+# Running OLTP-Bench Suite Fork (DEPRECATED)
+
+> This example is deprecated as OLTP-Bench is no longer active.  Please see [Benchbase](https://github.com/cmu-db/benchbase) instead.
+
 Demonstrates building and executing a fork of the `OLTP-Bench` suite against a 3 node CockroachDB cluster.  More information on the `OLTP-Bench` fork can be found here: https://github.com/timveil-cockroach/oltpbench.
 
 > This is included here as a functional example.  This configuration should not be considered the basis for a performance evaluation.

example-oltpbench/docker-compose.yml

@@ -6,7 +6,7 @@ services:
     container_name: crdb-0
     hostname: crdb-0
     image: cockroachdb/cockroach:latest
-    command: start-single-node --cluster-name=example-oltpbench --logtostderr=WARNING --log-file-verbosity=WARNING --insecure --max-sql-memory=4GB
+    command: start --cluster-name=example-oltpbench --logtostderr=WARNING --log-file-verbosity=WARNING --insecure --join=crdb-0 --max-sql-memory=4GB
 
   crdb-1:
     container_name: crdb-1
@@ -46,6 +46,7 @@ services:
     environment:
       - COCKROACH_HOST=crdb-0:26257
       - COCKROACH_INSECURE=true
+      - COCKROACH_INIT=true
       - DATABASE_NAME=oltpbench
     depends_on:
       - lb
@@ -57,6 +58,4 @@ services:
       context: oltp-bench
     environment:
       - BENCHMARK_NAME=tpcc
-      - BENCHMARK_CONFIG_FILE=crdb_tpcc_config.xml
-    depends_on:
-      - crdb-init
+      - BENCHMARK_CONFIG_FILE=crdb_tpcc_config.xml

example-secure-nginx/docker-compose.yml

@@ -22,7 +22,7 @@ services:
     container_name: roach-0
     hostname: roach-0
     image: cockroachdb/cockroach:latest
-    command: start-single-node --cluster-name=example-secure-nginx --logtostderr=WARNING --log-file-verbosity=WARNING --certs-dir=/certs
+    command: start --cluster-name=example-secure-nginx --logtostderr=WARNING --log-file-verbosity=WARNING --certs-dir=/certs --join=roach-0
     volumes:
       - certs-roach-0:/certs
     depends_on:
@@ -71,6 +71,7 @@ services:
       - COCKROACH_HOST=roach-0:26257
       - COCKROACH_INSECURE=false
       - COCKROACH_CERTS_DIR=/certs
+      - COCKROACH_INIT=true
       - DATABASE_NAME=test
       - DATABASE_USER=test
       - DATABASE_PASSWORD=password

example-ycsb/docker-compose.yml

@@ -6,7 +6,7 @@ services:
     container_name: crdb-0
     hostname: crdb-0
     image: cockroachdb/cockroach:latest
-    command: start-single-node --cluster-name=example-ycsb --logtostderr=WARNING --log-file-verbosity=WARNING --insecure
+    command: start --cluster-name=example-ycsb --logtostderr=WARNING --log-file-verbosity=WARNING --insecure --join=crdb-0
 
   crdb-1:
     container_name: crdb-1
@@ -46,6 +46,7 @@ services:
     environment:
       - COCKROACH_HOST=crdb-0:26257
       - COCKROACH_INSECURE=true
+      - COCKROACH_INIT=true
       - DATABASE_NAME=ycsb
     depends_on:
       - lb
@@ -62,5 +63,3 @@ services:
       - WORKLOAD_NAME=workload-b-cockroach
       - WORKLOAD_TARGET_OPS=100
       - WORKLOAD_RECORD_COUNT=20000
-    depends_on:
-      - crdb-init