From 3f159aa08b1b83aeb4315cd65e887757d32b023d Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 30 Oct 2023 14:03:57 +0100 Subject: [PATCH] Remove references to vespa-deploy --- en/application-packages.html | 20 +------------ en/config-introduction.html | 4 +-- en/contributing/configapi-dev-java.html | 2 +- en/contributing/configapi-dev.html | 9 ++---- en/document-processing.html | 4 +-- en/jdisc/container-components.html | 6 ++-- .../admin-procedures.html | 10 +++---- en/operations-selfhosted/config-proxy.html | 2 +- .../configuration-server.html | 14 +++++----- en/operations-selfhosted/live-upgrade.html | 2 +- en/operations-selfhosted/mtls.md | 9 ------ .../vespa-cmdline-tools.html | 6 ++-- en/performance/container-tuning.html | 4 +-- en/performance/profiling.html | 2 +- en/query-rewriting.html | 2 +- .../application-packages-reference.html | 5 ++-- en/reference/deploy-rest-api-v2.html | 3 +- en/reference/schema-reference.html | 28 +++++++++---------- en/vespa8-release-notes.html | 2 +- en/visiting.html | 3 +- 20 files changed, 53 insertions(+), 84 deletions(-) diff --git a/en/application-packages.html b/en/application-packages.html index 422f060e5d..6cc8202df3 100644 --- a/en/application-packages.html +++ b/en/application-packages.html @@ -77,7 +77,7 @@

Convergence

File distribution

The application package can have components and other large files. - At vespa-deploy prepare, these files are distributed to the nodes: + At vespa prepare, these files are distributed to the nodes:

diff --git a/en/config-introduction.html b/en/config-introduction.html index 04642b0d06..d6fffcb703 100644 --- a/en/config-introduction.html +++ b/en/config-introduction.html @@ -96,14 +96,14 @@

Configuration assembly

including which nodes belong in the system, which services they should run and the configuration of these services and their components. When the application deployer wants to change the application, - vespa-deploy prepare is issued to a config server, + vespa prepare is issued to a config server, with the application package as argument.

At this point the system model is assembled and validated and any feedback is issued to the deployer. If the deployer decides to make the new configuration active, - a vespa-deploy activate is then issued, + a vespa activate is then issued, causing the config server cluster to switch to the new system model and respond with new configs on any active subscriptions where the new system model caused the config to change. diff --git a/en/contributing/configapi-dev-java.html b/en/contributing/configapi-dev-java.html index 0eb8c97556..74ebe3c21d 100644 --- a/en/contributing/configapi-dev-java.html +++ b/en/contributing/configapi-dev-java.html @@ -153,7 +153,7 @@

Unit testing config

Use this to set up config fixtures for unit tests. The ConfigSubscriber has a reload() method which is used in tests to force the subscriptions into a new -generation. It emulates a vespa-deploy activate operation after +generation. It emulates a vespa activate operation after you have updated the ConfigSet.

A full example can be found in diff --git a/en/contributing/configapi-dev.html b/en/contributing/configapi-dev.html index abbb49b3ae..47da951397 100644 --- a/en/contributing/configapi-dev.html +++ b/en/contributing/configapi-dev.html @@ -176,16 +176,13 @@

Setting Up a Running System

To get a running system, first install the cloudconfig package, start the config server, then deploy the application: -

-$ vespa-deploy upload /path/to/app/folder
-
Prepare the application: 
-$ vespa-deploy prepare /path/to/app/folder
+$ vespa prepare /path/to/app/folder
Activate the application: 
-$ vespa-deploy activate /path/to/app/folder
+$ vespa activate /path/to/app/folder

Then, start vespa. This will start the application and pass it its config id @@ -278,7 +275,7 @@

Dependent Static Configs

to the same generation.

{% include note.html content="A generation is a monotonically increasing number which is increased - each time an application is deployed with vespa-deploy. + each time an application is deployed with vespa deploy. Certain applications may require that all configs are of the same generation to ensure consistency, especially container-like applications. All configs subscribed to by a ConfigSubscriber are guaranteed to be of the same generation."%} diff --git a/en/document-processing.html b/en/document-processing.html index 4c680a2e25..08cd3165a5 100644 --- a/en/document-processing.html +++ b/en/document-processing.html @@ -414,10 +414,10 @@

(Re)configuring Document Processing

Changing chain ids, components in a chain, component configuration and schema mapping all takes effect after - vespa-deploy activate - + vespa activate - no restart required. Changing a cluster name (i.e. the container id) - requires a restart of docproc services after vespa-deploy activate. + requires a restart of docproc services after vespa activate.

Note when adding or modifying a processing chain in a running cluster; if at the same time deploying a new document processor diff --git a/en/jdisc/container-components.html b/en/jdisc/container-components.html index 530b855e09..c404645f88 100644 --- a/en/jdisc/container-components.html +++ b/en/jdisc/container-components.html @@ -227,7 +227,7 @@

Deploying the Application Package

quick start. Once the component and the config are added to the application package, it can be deployed - by running vespa-deploy. + by running vespa deploy. These steps will copy any changed bundles to the nodes in the cluster which needs them and switch queries over to running the new component versions.

@@ -363,7 +363,7 @@

Troubleshooting

Container start

If there is some error in the application package, - it will usually be detected during the vespa-deploy prepare step and cause an error message. + it will usually be detected during the vespa prepare step and cause an error message. However, some classes of errors are only detected once the application is deployed. When redeploying an application, it is therefore recommended watching the vespa log by running:

@@ -376,7 +376,7 @@

Container start

If this message does not appear after a reasonable amount of time - after completion of vespa-deploy activate, + after completion of vespa activate, one will see some errors or warnings instead, that will help debug the application.

diff --git a/en/operations-selfhosted/admin-procedures.html b/en/operations-selfhosted/admin-procedures.html index 3dff4cc501..ab7e90e5a1 100644 --- a/en/operations-selfhosted/admin-procedures.html +++ b/en/operations-selfhosted/admin-procedures.html @@ -241,9 +241,9 @@

Monitor distance to ideal state

Cluster configuration

diff --git a/en/query-rewriting.html b/en/query-rewriting.html index 2918b04da3..76b0cc9e5f 100644 --- a/en/query-rewriting.html +++ b/en/query-rewriting.html @@ -182,7 +182,7 @@

Configuration

To deactivate the default rules, add rules.off to the query.

-The rules can safely be updated at any time by running vespa-deploy prepare again. +The rules can safely be updated at any time by running vespa prepare again. If there are errors in the rule bases, they will not be updated, and the errors will be reported on the command line.

diff --git a/en/reference/application-packages-reference.html b/en/reference/application-packages-reference.html index 3dfe8db7e3..83ebed73ce 100644 --- a/en/reference/application-packages-reference.html +++ b/en/reference/application-packages-reference.html @@ -9,7 +9,7 @@ This is the application package reference. An application package is the deployment unit in Vespa. To deploy an application, create an application package -and vespa-deploy or +and vespa deploy or use the deploy API. The application package is a directory of files and subdirectories:

@@ -187,8 +187,7 @@

Deploy

$ zip -r ../app.zip .

- Use whatever name for the zip file - then refer to the file instead of the path in deploy commands - - example. + Use any name for the zip file - then refer to the file instead of the path in deploy commands.

{% include important.html content='Using tar / gzip is not supported. Details.'%} diff --git a/en/reference/deploy-rest-api-v2.html b/en/reference/deploy-rest-api-v2.html index 76ed25ac9f..54a402a49f 100644 --- a/en/reference/deploy-rest-api-v2.html +++ b/en/reference/deploy-rest-api-v2.html @@ -54,8 +54,7 @@

- Use Vespa CLI to deploy from the command line, - or use the vespa-deploy tool. + Use Vespa CLI to deploy from the command line.

{% include note.html content='Use convergence to confirm configuration activation on all nodes.' %} diff --git a/en/reference/schema-reference.html b/en/reference/schema-reference.html index 0bee2f3e65..0e8a9415a9 100644 --- a/en/reference/schema-reference.html +++ b/en/reference/schema-reference.html @@ -4027,14 +4027,14 @@

Modifying schemas

Changes that require re-feed

-When running vespa-deploy prepare on a new application package, +When running vespa prepare on a new application package, the changes in the schema files are compared with the files in the current active package. -If some of the changes require restart or re-feed, the output from vespa-deploy prepare +If some of the changes require restart or re-feed, the output from vespa prepare specifies which actions are needed.

{% include important.html content=" For changes that are not covered below, -and no output is returned from vespa-deploy prepare, +and no output is returned from vespa prepare, the impact is undefined and in no way guaranteed to allow a system to stay live until re-feeding. Changes not related to the schema are discussed in admin procedures."%} @@ -4044,8 +4044,8 @@

Valid changes without restart

Procedure:

    -
  1. Run vespa-deploy prepare on the changed application
    2. -
  2. Run vespa-deploy activate. The changes will take effect immediately
    3. +
  3. Run vespa prepare on the changed application
    4. +
  4. Run vespa activate. The changes will take effect immediately
Changes: @@ -4146,9 +4146,9 @@

Changes that require resta

Procedure:

    -
  1. Run vespa-deploy prepare on the changed application. +
  2. Run vespa prepare on the changed application. Output specifies which restart actions are needed -
  3. Run vespa-deploy activate
    4. +
  4. Run vespa activate
  5. Restart services on the services specified in the prepare output
Changes: @@ -4206,7 +4206,7 @@

Changes that require resta } } -The following is output from vespa-deploy prepare - +The following is output from vespa prepare - which restart actions are needed: 
 WARNING: Change(s) between active and new application that require restart:
@@ -4225,9 +4225,9 @@ 
Changes that require reindexing

 or have potentially wrong annotations not matching the query processing. Procedure:
 

 
    
-  
  1. Run vespa-deploy prepare on the changed application.
+  
  2. Run vespa prepare on the changed application.
     Output specifies which reindexing actions are needed
-  
  3. Run vespa-deploy activate
    4. 
+  
  4. Run vespa activate
    5. 
   
  5. Trigger reindexing for the indicated document types and clusters
    6. 
 

 
Changes:

@@ -4320,7 +4320,7 @@ 
Changes that require reindexing

     }
 }
-The following is output from vespa-deploy prepare - +The following is output from vespa prepare - which reindex actions are needed: 
 WARNING: Change(s) between active and new application that require re-index:
@@ -4337,10 +4337,10 @@ 
Changes that require re-feed

 or have potentially wrong annotations not matching the query processing. Procedure:
 

 
    
-  
  1. Run vespa-deploy prepare on the changed application.
+  
  2. Run vespa prepare on the changed application.
     Output specifies which re-feed actions are needed
   
  3. Stop feeding, wait until done
    4. 
-  
  4. Run vespa-deploy activate
    5. 
+  
  5. Run vespa activate
    6. 
   
  6. Re-feed all documents
    7. 
 

 Changes:
@@ -4383,7 +4383,7 @@ 
Changes that require re-feed

     }
 }
-The following is output from vespa-deploy prepare - +The following is output from vespa prepare - which re-feed actions are needed: 
 WARNING: Change(s) between active and new application that require re-feed:
diff --git a/en/vespa8-release-notes.html b/en/vespa8-release-notes.html
index 7e130cf200..9bd1b8a19e 100644
--- a/en/vespa8-release-notes.html
+++ b/en/vespa8-release-notes.html
@@ -1268,6 +1268,6 @@ 
Upgrade procedure

   
   
  • 
     Redeploy and activate the application:
-    
    $ vespa-deploy prepare <app> && vespa-deploy activate
    
+    
    $ vespa deploy
    
   
    • 
 
diff --git a/en/visiting.html b/en/visiting.html
index 45dcff07ac..55d1f112fa 100644
--- a/en/visiting.html
+++ b/en/visiting.html
@@ -223,8 +223,7 @@ 
    1. Set up a document reprocessin
 After having changed the Vespa setup, reload config:
 
    
 
    -$ vespa-deploy prepare music
-$ vespa-deploy activate
+$ vespa deploy music
 
    
 
    Restart nodes as well to activate.