diff --git a/build/verify-archive.sh b/build/verify-archive.sh index 8cdc02e4335e..a79608e0003d 100755 --- a/build/verify-archive.sh +++ b/build/verify-archive.sh @@ -15,7 +15,7 @@ workdir=$(mktemp -d) tar xzf cockroach.src.tgz -C "$workdir" (cd "$workdir"/cockroach-* && make clean && make install) -cockroach start --insecure --store type=mem,size=1GiB --background +cockroach start-single-node --insecure --store type=mem,size=1GiB --background cockroach sql --insecure <>logs/expect-cmd.log 2>&1 & + $argv start-single-node --insecure --pid-file=server_pid --listening-url-file=url_fifo --background -s=path=logs/db >>logs/expect-cmd.log 2>&1 & cat url_fifo > server_url" report "START SERVER DONE" } diff --git a/pkg/cli/interactive_tests/test_audit_log.tcl b/pkg/cli/interactive_tests/test_audit_log.tcl index fdede45e3c09..bc38aa016274 100644 --- a/pkg/cli/interactive_tests/test_audit_log.tcl +++ b/pkg/cli/interactive_tests/test_audit_log.tcl @@ -62,7 +62,7 @@ stop_server $argv start_test "Check that audit logging works even with a custom directory" # Start a server with a custom log -system "$argv start --insecure --pid-file=server_pid --listening-url-file=url_fifo --background -s=path=logs/db --sql-audit-dir=logs/db/audit-new >>logs/expect-cmd.log 2>&1 & cat url_fifo > server_url" +system "$argv start-single-node --insecure --pid-file=server_pid --listening-url-file=url_fifo --background -s=path=logs/db --sql-audit-dir=logs/db/audit-new >>logs/expect-cmd.log 2>&1 & cat url_fifo > server_url" set logfile logs/db/audit-new/cockroach-sql-audit.log diff --git a/pkg/cli/interactive_tests/test_cert_advisory_validation.tcl b/pkg/cli/interactive_tests/test_cert_advisory_validation.tcl index 56a698afe5f2..e88d4fb8b896 100644 --- a/pkg/cli/interactive_tests/test_cert_advisory_validation.tcl +++ b/pkg/cli/interactive_tests/test_cert_advisory_validation.tcl @@ -21,7 +21,7 @@ send "$argv cert create-node localhost --certs-dir=$certs_dir --ca-key=$certs_di eexpect $prompt start_test "Check that the server reports a warning if attempting to advertise an IP address not in cert." -send "$argv start --certs-dir=$certs_dir --advertise-addr=127.0.0.1\r" +send "$argv start-single-node --certs-dir=$certs_dir --advertise-addr=127.0.0.1\r" eexpect "advertise address" eexpect "127.0.0.1" eexpect "not in node certificate" @@ -32,7 +32,7 @@ eexpect $prompt end_test start_test "Check that the server reports no warning if the avertise addr is in th cert." -send "$argv start --certs-dir=$certs_dir --advertise-addr=localhost\r" +send "$argv start-single-node --certs-dir=$certs_dir --advertise-addr=localhost\r" expect { "not in node certificate" { report "unexpected warning" diff --git a/pkg/cli/interactive_tests/test_encryption.tcl b/pkg/cli/interactive_tests/test_encryption.tcl index 121f580ff04d..39692c12c1e1 100644 --- a/pkg/cli/interactive_tests/test_encryption.tcl +++ b/pkg/cli/interactive_tests/test_encryption.tcl @@ -35,7 +35,7 @@ file_has_size "$keydir/aes-256.key" "64" end_test start_test "Start normal node." -send "$argv start --insecure --store=$storedir\r" +send "$argv start-single-node --insecure --store=$storedir\r" eexpect "node starting" interrupt eexpect "shutdown completed" @@ -44,47 +44,47 @@ eexpect "" end_test start_test "Restart with plaintext." -send "$argv start --insecure --store=$storedir --enterprise-encryption=path=$storedir,key=plain,old-key=plain\r" +send "$argv start-single-node --insecure --store=$storedir --enterprise-encryption=path=$storedir,key=plain,old-key=plain\r" eexpect "node starting" interrupt eexpect "shutdown completed" send "$argv debug encryption-status $storedir --enterprise-encryption=path=$storedir,key=plain,old-key=plain\r" eexpect " \"Active\": true,\r\n \"Type\": \"Plaintext\"," # Try starting without the encryption flag. -send "$argv start --insecure --store=$storedir\r" +send "$argv start-single-node --insecure --store=$storedir\r" eexpect "encryption was used on this store before, but no encryption flags specified." end_test start_test "Restart with AES-128." -send "$argv start --insecure --store=$storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-128.key,old-key=plain\r" +send "$argv start-single-node --insecure --store=$storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-128.key,old-key=plain\r" eexpect "node starting" interrupt eexpect "shutdown completed" send "$argv debug encryption-status $storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-128.key,old-key=plain\r" eexpect " \"Active\": true,\r\n \"Type\": \"AES128_CTR\"," # Try starting without the encryption flag. -send "$argv start --insecure --store=$storedir\r" +send "$argv start-single-node --insecure --store=$storedir\r" eexpect "encryption was used on this store before, but no encryption flags specified." # Try with the wrong key. -send "$argv start --insecure --store=$storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-192.key,old-key=plain\r" +send "$argv start-single-node --insecure --store=$storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-192.key,old-key=plain\r" eexpect "key_manager does not have a key with ID" end_test start_test "Restart with AES-256." -send "$argv start --insecure --store=$storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-256.key,old-key=$keydir/aes-128.key\r" +send "$argv start-single-node --insecure --store=$storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-256.key,old-key=$keydir/aes-128.key\r" eexpect "node starting" interrupt eexpect "shutdown completed" send "$argv debug encryption-status $storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-256.key,old-key=plain\r" eexpect " \"Active\": true,\r\n \"Type\": \"AES256_CTR\"," # Startup again, but don't specify the old key, it's no longer in use. -send "$argv start --insecure --store=$storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-256.key,old-key=plain\r" +send "$argv start-single-node --insecure --store=$storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-256.key,old-key=plain\r" eexpect "node starting" interrupt # Try starting without the encryption flag. -send "$argv start --insecure --store=$storedir\r" +send "$argv start-single-node --insecure --store=$storedir\r" eexpect "encryption was used on this store before, but no encryption flags specified." # Try with the wrong key. -send "$argv start --insecure --store=$storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-192.key,old-key=plain\r" +send "$argv start-single-node --insecure --store=$storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-192.key,old-key=plain\r" eexpect "key_manager does not have a key with ID" end_test diff --git a/pkg/cli/interactive_tests/test_error_hints.tcl b/pkg/cli/interactive_tests/test_error_hints.tcl index 0bc8e7dab30c..fbb9e72a3f18 100644 --- a/pkg/cli/interactive_tests/test_error_hints.tcl +++ b/pkg/cli/interactive_tests/test_error_hints.tcl @@ -43,7 +43,7 @@ end_test # Check what happens when attempting to connect securely to an # insecure server. -send "$argv start --insecure\r" +send "$argv start-single-node --insecure\r" eexpect "initialized new cluster" spawn /bin/bash @@ -73,7 +73,7 @@ interrupt interrupt eexpect ":/# " -send "$argv start --certs-dir=$certs_dir\r" +send "$argv start-single-node --listen-addr=localhost --certs-dir=$certs_dir\r" eexpect "restarted pre-existing node" set spawn_id $client_spawn_id diff --git a/pkg/cli/interactive_tests/test_extern_dir.tcl b/pkg/cli/interactive_tests/test_extern_dir.tcl index ebc130f8a188..1f99d4c87f19 100644 --- a/pkg/cli/interactive_tests/test_extern_dir.tcl +++ b/pkg/cli/interactive_tests/test_extern_dir.tcl @@ -11,14 +11,14 @@ eexpect ":/# " start_test "Check that non-absolute external-io-dir rejected" -send "$argv start --insecure --store=$storedir --external-io-dir=blah\r" +send "$argv start-single-node --insecure --store=$storedir --external-io-dir=blah\r" eexpect "external-io-dir path must be absolute" end_test start_test "Check disabling external IO explicitly" -send "$argv start --insecure --store=$storedir --external-io-dir=disabled\r" +send "$argv start-single-node --insecure --store=$storedir --external-io-dir=disabled\r" eexpect "external I/O path: " interrupt eexpect "shutdown completed" @@ -27,7 +27,7 @@ end_test start_test "Check setting external IO explicitly" -send "$argv start --insecure --store=$storedir --external-io-dir=$externdir\r" +send "$argv start-single-node --insecure --store=$storedir --external-io-dir=$externdir\r" eexpect "external I/O path: $externdir" interrupt eexpect "shutdown completed" @@ -36,7 +36,7 @@ end_test start_test "Check implicit external I/O dir under store dir" -send "$argv start --insecure --store=$storedir\r" +send "$argv start-single-node --insecure --store=$storedir\r" eexpect "external I/O path: $env(HOME)/$storedir/extern" interrupt eexpect "shutdown completed" diff --git a/pkg/cli/interactive_tests/test_flags.tcl b/pkg/cli/interactive_tests/test_flags.tcl index 61e109720e6b..6b5b2ea04bc1 100644 --- a/pkg/cli/interactive_tests/test_flags.tcl +++ b/pkg/cli/interactive_tests/test_flags.tcl @@ -7,28 +7,28 @@ send "PS1=':''/# '\r" eexpect ":/# " start_test "Check that --max-disk-temp-storage works." -send "$argv start --insecure --store=path=mystore --max-disk-temp-storage=10GiB\r" +send "$argv start-single-node --insecure --store=path=mystore --max-disk-temp-storage=10GiB\r" eexpect "node starting" interrupt eexpect ":/# " end_test start_test "Check that --max-disk-temp-storage can be expressed as a percentage." -send "$argv start --insecure --store=path=mystore --max-disk-temp-storage=10%\r" +send "$argv start-single-node --insecure --store=path=mystore --max-disk-temp-storage=10%\r" eexpect "node starting" interrupt eexpect ":/# " end_test start_test "Check that --max-disk-temp-storage percentage works when the store is in-memory." -send "$argv start --insecure --store=type=mem,size=1GB --max-disk-temp-storage=10%\r" +send "$argv start-single-node --insecure --store=type=mem,size=1GB --max-disk-temp-storage=10%\r" eexpect "node starting" interrupt eexpect ":/# " end_test start_test "Check that memory max flags do not exceed available RAM." -send "$argv start --insecure --cache=.40 --max-sql-memory=.40\r" +send "$argv start-single-node --insecure --cache=.40 --max-sql-memory=.40\r" eexpect "WARNING: the sum of --max-sql-memory" eexpect "is larger than" eexpect "of total RAM" @@ -39,7 +39,7 @@ eexpect ":/# " end_test start_test "Check that not using --host nor --advertise causes a user warning." -send "$argv start --insecure\r" +send "$argv start-single-node --insecure\r" eexpect "WARNING: neither --listen-addr nor --advertise-addr was specified" eexpect "node starting" interrupt @@ -47,7 +47,7 @@ eexpect ":/# " end_test start_test "Check that --listening-url-file gets created with the right data" -send "$argv start --insecure --listening-url-file=foourl\r" +send "$argv start-single-node --insecure --listening-url-file=foourl\r" eexpect "node starting" system "grep -q 'postgresql://.*@.*:\[0-9\]\[0-9\]*' foourl" interrupt @@ -57,16 +57,36 @@ end_test start_test {Check that the "failed running SUBCOMMAND" message does not consider a flag the subcommand} send "$argv --vmodule=*=2 start --garbage\r" eexpect {Failed running "start"} +eexpect ":/# " end_test start_test {Check that the "failed running SUBCOMMAND" message handles nested subcommands} send "$argv --vmodule=*=2 debug zip --garbage\r" eexpect {Failed running "debug zip"} +eexpect ":/# " end_test start_test {Check that the "failed running SUBCOMMAND" message handles missing subcommands} send "$argv --vmodule=*=2 --garbage\r" eexpect {Failed running "cockroach"} +eexpect ":/# " +end_test + +start_test "Check that start without --join reports a deprecation warning" +send "$argv start --insecure\r" +eexpect "running 'cockroach start' without --join is deprecated." +eexpect "node starting" +interrupt +eexpect ":/# " +end_test + +start_test "Check that start-single-node disables replication properly" +system "rm -rf logs/db" +start_server $argv +send "$argv sql -e 'show zone configuration for range default'\r" +eexpect "num_replicas = 1" +eexpect ":/# " +stop_server $argv end_test send "exit 0\r" diff --git a/pkg/cli/interactive_tests/test_high_verbosity.tcl b/pkg/cli/interactive_tests/test_high_verbosity.tcl index 5bc73a45b99b..fafc692f7122 100644 --- a/pkg/cli/interactive_tests/test_high_verbosity.tcl +++ b/pkg/cli/interactive_tests/test_high_verbosity.tcl @@ -2,7 +2,7 @@ source [file join [file dirname $argv0] common.tcl] -system "mkfifo url_fifo || true; $argv start --insecure --vmodule=*=3 --pid-file=server_pid --listening-url-file=url_fifo -s=path=logs/db & cat url_fifo > server_url" +system "mkfifo url_fifo || true; $argv start-single-node --insecure --vmodule=*=3 --pid-file=server_pid --listening-url-file=url_fifo -s=path=logs/db & cat url_fifo > server_url" spawn /bin/bash send "PS1=':''/# '\r" diff --git a/pkg/cli/interactive_tests/test_log_config_msg.tcl b/pkg/cli/interactive_tests/test_log_config_msg.tcl index f88f933c9b9b..d45173bb2982 100644 --- a/pkg/cli/interactive_tests/test_log_config_msg.tcl +++ b/pkg/cli/interactive_tests/test_log_config_msg.tcl @@ -14,7 +14,7 @@ end_test # Make a server with a tiny log buffer so as to force frequent log rotation. -system "mkfifo url_fifo || true; $argv start --insecure --pid-file=server_pid --listening-url-file=url_fifo --background -s=path=logs/db --log-file-max-size=2k >>logs/expect-cmd.log 2>&1 & cat url_fifo > server_url" +system "mkfifo url_fifo || true; $argv start-single-node --insecure --pid-file=server_pid --listening-url-file=url_fifo --background -s=path=logs/db --log-file-max-size=2k >>logs/expect-cmd.log 2>&1 & cat url_fifo > server_url" stop_server $argv start_test "Check that the cluster ID is reported at the start of new log files." diff --git a/pkg/cli/interactive_tests/test_log_flags.tcl b/pkg/cli/interactive_tests/test_log_flags.tcl index f47a653b8fda..5a50655643c9 100644 --- a/pkg/cli/interactive_tests/test_log_flags.tcl +++ b/pkg/cli/interactive_tests/test_log_flags.tcl @@ -13,7 +13,7 @@ eexpect ":/# " # to exit entirely (it has errorHandling set to ExitOnError). start_test "Check that log files are created by default in the store directory." -send "$argv start --insecure --store=path=logs/mystore\r" +send "$argv start-single-node --insecure --store=path=logs/mystore\r" eexpect "node starting" interrupt eexpect ":/# " @@ -23,7 +23,7 @@ eexpect ":/# " end_test start_test "Check that an empty -log-dir disables file logging." -send "$argv start --insecure --store=path=logs/mystore2 --log-dir=\r" +send "$argv start-single-node --insecure --store=path=logs/mystore2 --log-dir=\r" eexpect "node starting" interrupt eexpect ":/# " @@ -33,32 +33,32 @@ eexpect ":/# " end_test start_test "Check that leading tildes are properly rejected." -send "$argv start --insecure -s=path=logs/db --log-dir=\~/blah\r" +send "$argv start-single-node --insecure -s=path=logs/db --log-dir=\~/blah\r" eexpect "log directory cannot start with '~'" eexpect ":/# " end_test start_test "Check that the user can override." -send "$argv start --insecure -s=path=logs/db --log-dir=logs/blah/\~/blah\r" +send "$argv start-single-node --insecure -s=path=logs/db --log-dir=logs/blah/\~/blah\r" eexpect "logs: *blah/~/blah" interrupt eexpect ":/# " end_test start_test "Check that TRUE and FALSE are valid values for the severity flags." -send "$argv start --insecure -s=path=logs/db --logtostderr=false\r" +send "$argv start-single-node --insecure -s=path=logs/db --logtostderr=false\r" eexpect "node starting" interrupt eexpect ":/# " -send "$argv start --insecure -s=path=logs/db --logtostderr=true\r" +send "$argv start-single-node --insecure -s=path=logs/db --logtostderr=true\r" eexpect "node starting" interrupt eexpect ":/# " -send "$argv start --insecure -s=path=logs/db --logtostderr=2\r" +send "$argv start-single-node --insecure -s=path=logs/db --logtostderr=2\r" eexpect "node starting" interrupt eexpect ":/# " -send "$argv start --insecure -s=path=logs/db --logtostderr=cantparse\r" +send "$argv start-single-node --insecure -s=path=logs/db --logtostderr=cantparse\r" eexpect "parsing \"cantparse\": invalid syntax" eexpect ":/# " end_test diff --git a/pkg/cli/interactive_tests/test_missing_log_output.tcl b/pkg/cli/interactive_tests/test_missing_log_output.tcl index c6fdc31dd686..4e6b28c6f1c8 100644 --- a/pkg/cli/interactive_tests/test_missing_log_output.tcl +++ b/pkg/cli/interactive_tests/test_missing_log_output.tcl @@ -7,7 +7,7 @@ send "PS1=':''/# '\r" eexpect ":/# " start_test "Check that a server encountering a fatal error when not logging to stderr shows the fatal error." -send "$argv start -s=path=logs/db --insecure\r" +send "$argv start-single-node -s=path=logs/db --insecure\r" eexpect "CockroachDB node starting" system "$argv sql --insecure -e \"select crdb_internal.force_log_fatal('helloworld')\" || true" eexpect "\r\nF" @@ -19,7 +19,7 @@ eexpect ":/# " end_test start_test "Check that a broken stderr prints a message to the log files." -send "$argv start -s=path=logs/db --insecure --logtostderr --vmodule=*=1 2>&1 | cat\r" +send "$argv start-single-node -s=path=logs/db --insecure --logtostderr --vmodule=*=1 2>&1 | cat\r" eexpect "CockroachDB node starting" system "killall cat" eexpect ":/# " @@ -30,13 +30,13 @@ start_test "Check that a broken log file prints a message to stderr." # The path that we pass to the --log-dir will already exist as a file. system "mkdir -p logs" system "touch logs/broken" -send "$argv start -s=path=logs/db --log-dir=logs/broken --insecure --logtostderr\r" +send "$argv start-single-node -s=path=logs/db --log-dir=logs/broken --insecure --logtostderr\r" eexpect "unable to create log directory" eexpect ":/# " end_test start_test "Check that a server started with only in-memory stores and no --log-dir automatically logs to stderr." -send "$argv start --insecure --store=type=mem,size=1GiB\r" +send "$argv start-single-node --insecure --store=type=mem,size=1GiB\r" eexpect "CockroachDB node starting" end_test @@ -52,7 +52,7 @@ eexpect ":/# " stop_server $argv start_test "Check that a server started with --logtostderr logs even info messages to stderr." -send "$argv start -s=path=logs/db --insecure --logtostderr\r" +send "$argv start-single-node -s=path=logs/db --insecure --logtostderr\r" eexpect "CockroachDB node starting" end_test @@ -61,7 +61,7 @@ interrupt eexpect ":/# " start_test "Check that --logtostderr can override the threshold but no error is printed on startup" -send "echo marker; $argv start -s=path=logs/db --insecure --logtostderr=ERROR 2>&1 | grep -v '^\\*'\r" +send "echo marker; $argv start-single-node -s=path=logs/db --insecure --logtostderr=ERROR 2>&1 | grep -v '^\\*'\r" eexpect "marker\r\nCockroachDB node starting" end_test @@ -70,7 +70,7 @@ interrupt eexpect ":/# " start_test "Check that panic reports are printed to the log even when --logtostderr is specified" -send "$argv start -s=path=logs/db --insecure --logtostderr\r" +send "$argv start-single-node -s=path=logs/db --insecure --logtostderr\r" eexpect "CockroachDB node starting" system "$argv sql --insecure -e \"select crdb_internal.force_panic('helloworld')\" || true" diff --git a/pkg/cli/interactive_tests/test_secure.tcl b/pkg/cli/interactive_tests/test_secure.tcl index 0f3ad6ebf376..5eb2c0f1200a 100644 --- a/pkg/cli/interactive_tests/test_secure.tcl +++ b/pkg/cli/interactive_tests/test_secure.tcl @@ -4,6 +4,7 @@ source [file join [file dirname $argv0] common.tcl] set certs_dir "/certs" set ::env(COCKROACH_INSECURE) "false" +set ::env(COCKROACH_HOST) "localhost" spawn /bin/bash send "PS1=':''/# '\r" @@ -12,7 +13,7 @@ set prompt ":/# " eexpect $prompt start_test "Check that --insecure reports that the server is really insecure" -send "$argv start --insecure\r" +send "$argv start-single-node --insecure\r" eexpect "WARNING: RUNNING IN INSECURE MODE" eexpect "node starting" interrupt @@ -22,7 +23,7 @@ end_test proc start_secure_server {argv certs_dir} { report "BEGIN START SECURE SERVER" - system "mkfifo url_fifo || true; $argv start --certs-dir=$certs_dir --pid-file=server_pid --listening-url-file=url_fifo -s=path=logs/db >>expect-cmd.log 2>&1 & cat url_fifo > server_url" + system "mkfifo url_fifo || true; $argv start-single-node --certs-dir=$certs_dir --pid-file=server_pid --listening-url-file=url_fifo -s=path=logs/db >>expect-cmd.log 2>&1 & cat url_fifo > server_url" report "END START SECURE SERVER" } diff --git a/pkg/cli/interactive_tests/test_server_sig.tcl b/pkg/cli/interactive_tests/test_server_sig.tcl index 375bbbe22b5f..b94521049362 100644 --- a/pkg/cli/interactive_tests/test_server_sig.tcl +++ b/pkg/cli/interactive_tests/test_server_sig.tcl @@ -9,7 +9,7 @@ send "PS1='\\h:''/# '\r" eexpect ":/# " start_test "Check that the server shuts down upon receiving SIGTERM" -send "$argv start --insecure --pid-file=server_pid --log-dir=logs \r" +send "$argv start-single-node --insecure --pid-file=server_pid --log-dir=logs \r" eexpect "initialized" system "kill `cat server_pid`" @@ -25,7 +25,7 @@ eexpect ":/# " end_test start_test "Check that the server shuts down upon receiving Ctrl+C." -send "$argv start --insecure --pid-file=server_pid --log-dir=logs \r" +send "$argv start-single-node --insecure --pid-file=server_pid --log-dir=logs \r" eexpect "restarted" interrupt @@ -43,7 +43,7 @@ end_test start_test "Check that the server shuts down fast upon receiving Ctrl+C twice." # Start a server via the shell -send "$argv start --insecure --pid-file=server_pid --log-dir=logs \r" +send "$argv start-single-node --insecure --pid-file=server_pid --log-dir=logs \r" eexpect "restarted" # Make a client open a connection and keep using it with an open txn. diff --git a/pkg/cli/interactive_tests/test_sql_mem_monitor.tcl b/pkg/cli/interactive_tests/test_sql_mem_monitor.tcl index 12bf6f6f4e8b..5351ece492f4 100644 --- a/pkg/cli/interactive_tests/test_sql_mem_monitor.tcl +++ b/pkg/cli/interactive_tests/test_sql_mem_monitor.tcl @@ -44,7 +44,7 @@ send "ulimit -v [ expr {3*$vmem/2} ]\r" eexpect ":/# " # Start a server with this limit set. The server will now run in the foreground. -send "$argv start --insecure --max-sql-memory=25% --no-redirect-stderr -s=path=logs/db \r" +send "$argv start-single-node --insecure --max-sql-memory=25% --no-redirect-stderr -s=path=logs/db \r" eexpect "restarted pre-existing node" sleep 1 @@ -91,7 +91,7 @@ end_test start_test "Ensure that memory monitoring prevents crashes" # Re-launch a server with relatively lower limit for SQL memory set spawn_id $shell_spawn_id -send "$argv start --insecure --max-sql-memory=1000K --no-redirect-stderr -s=path=logs/db \r" +send "$argv start-single-node --insecure --max-sql-memory=1000K --no-redirect-stderr -s=path=logs/db \r" eexpect "restarted pre-existing node" sleep 2 diff --git a/pkg/cli/interactive_tests/test_temp_dir.tcl b/pkg/cli/interactive_tests/test_temp_dir.tcl index 4eb00b5191cf..7b10364f2877 100644 --- a/pkg/cli/interactive_tests/test_temp_dir.tcl +++ b/pkg/cli/interactive_tests/test_temp_dir.tcl @@ -50,7 +50,7 @@ eexpect ":/# " start_test "Check that on node startup a temporary subdirectory is created under --temp-dir and recorded to a record file, and on node shutdown the directory is removed." send "mkdir -p $tempdir\r" -send "$argv start --insecure --store=$storedir --temp-dir=$tempdir\r" +send "$argv start-single-node --insecure --store=$storedir --temp-dir=$tempdir\r" eexpect "node starting" eexpect "temp dir:*$tempdir/$tempprefix" # Verify the temp directory under first store is created. @@ -75,7 +75,7 @@ end_test start_test "Check that on node startup a temporary subdirectory is created under --temp-dir even if store is in-memory and removed on shutdown." send "mkdir -p $tempdir\r" -send "$argv start --insecure --store=type=mem,size=1GB --temp-dir=$tempdir\r" +send "$argv start-single-node --insecure --store=type=mem,size=1GB --temp-dir=$tempdir\r" eexpect "node starting" eexpect "temp dir:*$tempdir/$tempprefix" # Verify the temp directory under first store is created. @@ -91,7 +91,7 @@ send "mkdir -p $tempdir $storedir/temp1 $storedir/temp2\r" send "echo foobartext > $storedir/temp1/foo.txt\r" # We add the temp directories to the record file. send "cat > $storedir/$recordfile <