[arvados] updated: 2.7.0-6594-g35779c1cc5
git repository hosting
git at public.arvados.org
Mon May 20 18:23:55 UTC 2024
Summary of changes:
...nstall-manual-prerequisites.html.textile.liquid | 4 +-
lib/config/config.default.yml | 12 -----
lib/config/export.go | 2 -
sdk/go/arvados/config.go | 3 --
sdk/go/arvados/job.go | 47 -------------------
sdk/go/arvados/pipeline_instance.go | 32 -------------
sdk/go/arvados/pipeline_template.go | 26 -----------
sdk/go/arvados/trait.go | 25 ----------
sdk/ruby/README | 6 +--
.../api/config/initializers/legacy_jobs_api.rb | 20 --------
services/api/lib/enable_jobs_api.rb | 53 ----------------------
11 files changed, 5 insertions(+), 225 deletions(-)
delete mode 100644 sdk/go/arvados/job.go
delete mode 100644 sdk/go/arvados/pipeline_instance.go
delete mode 100644 sdk/go/arvados/pipeline_template.go
delete mode 100644 sdk/go/arvados/trait.go
delete mode 100644 services/api/config/initializers/legacy_jobs_api.rb
delete mode 100644 services/api/lib/enable_jobs_api.rb
via 35779c1cc5e9666525432866b5e64eee9cb36a12 (commit)
via 3827f421a26294d8e20a2d7b0c3be25c2c26f9e5 (commit)
via e318cd8530bd0d77ed0ed02244ade40222d05ca1 (commit)
via fff7dfd72ee4000c5148471c74659beed88ad3c6 (commit)
from b7cd4ec5a03be7d9f48540e1426522837a01a2cc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 35779c1cc5e9666525432866b5e64eee9cb36a12
Author: Tom Clegg <tom at curii.com>
Date: Mon May 20 14:22:29 2024 -0400
15397: Add trailing slash to dir links, to avoid extra redirect.
Thanks to linkchecker warnings.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/doc/install/install-manual-prerequisites.html.textile.liquid b/doc/install/install-manual-prerequisites.html.textile.liquid
index ba179f82dd..e4a5004f06 100644
--- a/doc/install/install-manual-prerequisites.html.textile.liquid
+++ b/doc/install/install-manual-prerequisites.html.textile.liquid
@@ -11,7 +11,7 @@ SPDX-License-Identifier: CC-BY-SA-3.0
Before attempting installation, you should begin by reviewing supported platforms, choosing backends for identity, storage, and scheduling, and decide how you will distribute Arvados services onto machines. You should also choose an Arvados Cluster ID, choose your hostnames, and aquire TLS certificates. It may be helpful to make notes as you go along using one of these worksheets: "New cluster checklist for AWS":new_cluster_checklist_AWS.xlsx - "New cluster checklist for Azure":new_cluster_checklist_Azure.xlsx - "New cluster checklist for on premises Slurm":new_cluster_checklist_slurm.xlsx
-The installation guide describes how to set up a basic standalone Arvados instance. Additional configuration for features including "federation,":{{site.baseurl}}/admin/federation.html "collection versioning,":{{site.baseurl}}/admin/collection-versioning.html "managed properties,":{{site.baseurl}}/admin/collection-managed-properties.html and "storage classes":{{site.baseurl}}/admin/collection-managed-properties.html are described in the "Admin guide.":{{site.baseurl}}/admin
+The installation guide describes how to set up a basic standalone Arvados instance. Additional configuration for features including "federation,":{{site.baseurl}}/admin/federation.html "collection versioning,":{{site.baseurl}}/admin/collection-versioning.html "managed properties,":{{site.baseurl}}/admin/collection-managed-properties.html and "storage classes":{{site.baseurl}}/admin/collection-managed-properties.html are described in the "Admin guide.":{{site.baseurl}}/admin/
The Arvados storage subsystem is called "keep". The compute subsystem is called "crunch".
@@ -31,7 +31,7 @@ h2(#supportedlinux). Supported GNU/Linux distributions
h2(#components). Choosing which components to install
-Arvados consists of many components, some of which may be omitted (at the cost of reduced functionality.) It may also be helpful to review the "Arvados Architecture":{{site.baseurl}}/architecture to understand how these components interact.
+Arvados consists of many components, some of which may be omitted (at the cost of reduced functionality.) It may also be helpful to review the "Arvados Architecture":{{site.baseurl}}/architecture/ to understand how these components interact.
table(table table-bordered table-condensed).
|\3=. *Core*|
commit 3827f421a26294d8e20a2d7b0c3be25c2c26f9e5
Author: Tom Clegg <tom at curii.com>
Date: Mon May 20 10:56:43 2024 -0400
15397: Remove config and code for enabling Jobs/crunch1 API.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 045ce1c212..2569a52913 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1326,18 +1326,6 @@ Clusters:
# MaxRunTimeDefault: 2h
MaxRunTimeDefault: 0
- JobsAPI:
- # Enable the legacy 'jobs' API (crunch v1). This value must be a string.
- #
- # Note: this only enables read-only access, creating new
- # legacy jobs and pipelines is not supported.
- #
- # 'auto' -- (default) enable the Jobs API only if it has been used before
- # (i.e., there are job records in the database)
- # 'true' -- enable the Jobs API despite lack of existing records.
- # 'false' -- disable the Jobs API despite presence of existing records.
- Enable: 'auto'
-
CloudVMs:
# Enable the cloud scheduler.
Enable: false
diff --git a/lib/config/export.go b/lib/config/export.go
index 5c41b6b725..aa9594913e 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -131,8 +131,6 @@ var whitelist = map[string]bool{
"Containers.CrunchRunCommand": false,
"Containers.DefaultKeepCacheRAM": true,
"Containers.DispatchPrivateKey": false,
- "Containers.JobsAPI": true,
- "Containers.JobsAPI.Enable": true,
"Containers.LocalKeepBlobBuffersPerVCPU": false,
"Containers.LocalKeepLogsToContainerLog": false,
"Containers.Logging": false,
diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 149e319a7e..f7daa4c40d 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -497,9 +497,6 @@ type ContainersConfig struct {
LocalKeepBlobBuffersPerVCPU int
LocalKeepLogsToContainerLog string
- JobsAPI struct {
- Enable string
- }
Logging struct {
LogUpdatePeriod Duration
LogUpdateSize ByteSize
diff --git a/services/api/config/initializers/legacy_jobs_api.rb b/services/api/config/initializers/legacy_jobs_api.rb
deleted file mode 100644
index b6a2895f78..0000000000
--- a/services/api/config/initializers/legacy_jobs_api.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-# Config must be done before we files; otherwise they
-# won't be able to use Rails.configuration.* to initialize their
-# classes.
-
-require 'enable_jobs_api'
-
-Rails.application.configure do
- begin
- if ENV["ARVADOS_CONFIG"] != "none" && ActiveRecord::Base.connection.tables.include?('jobs')
- check_enable_legacy_jobs_api
- end
- rescue ActiveRecord::NoDatabaseError
- # Since rails 5.2, all initializers are run by rake tasks (like db:create),
- # see: https://github.com/rails/rails/issues/32870
- end
-end
diff --git a/services/api/lib/enable_jobs_api.rb b/services/api/lib/enable_jobs_api.rb
deleted file mode 100644
index 6718d384ee..0000000000
--- a/services/api/lib/enable_jobs_api.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-Disable_update_jobs_api_method_list = ConfigLoader.to_OrderedOptions({
- "jobs.create"=>{},
- "pipeline_instances.create"=>{},
- "pipeline_templates.create"=>{},
- "jobs.update"=>{},
- "pipeline_instances.update"=>{},
- "pipeline_templates.update"=>{},
- "job_tasks.create"=>{},
- "job_tasks.update"=>{}
- })
-
-Disable_jobs_api_method_list = ConfigLoader.to_OrderedOptions({
- "jobs.create"=>{},
- "pipeline_instances.create"=>{},
- "pipeline_templates.create"=>{},
- "jobs.get"=>{},
- "pipeline_instances.get"=>{},
- "pipeline_templates.get"=>{},
- "jobs.list"=>{},
- "pipeline_instances.list"=>{},
- "pipeline_templates.list"=>{},
- "jobs.index"=>{},
- "pipeline_instances.index"=>{},
- "pipeline_templates.index"=>{},
- "jobs.update"=>{},
- "pipeline_instances.update"=>{},
- "pipeline_templates.update"=>{},
- "jobs.queue"=>{},
- "jobs.queue_size"=>{},
- "job_tasks.create"=>{},
- "job_tasks.get"=>{},
- "job_tasks.list"=>{},
- "job_tasks.index"=>{},
- "job_tasks.update"=>{},
- "jobs.show"=>{},
- "pipeline_instances.show"=>{},
- "pipeline_templates.show"=>{},
- "job_tasks.show"=>{}})
-
-def check_enable_legacy_jobs_api
- # Create/update is permanently disabled (legacy functionality has been removed)
- Rails.configuration.API.DisabledAPIs.merge! Disable_update_jobs_api_method_list
-
- if Rails.configuration.Containers.JobsAPI.Enable == "false" ||
- (Rails.configuration.Containers.JobsAPI.Enable == "auto" &&
- ActiveRecord::Base.connection.select_value("SELECT COUNT(*) FROM jobs LIMIT 1") == 0)
- Rails.configuration.API.DisabledAPIs.merge! Disable_jobs_api_method_list
- end
-end
commit e318cd8530bd0d77ed0ed02244ade40222d05ca1
Author: Tom Clegg <tom at curii.com>
Date: Mon May 20 10:53:36 2024 -0400
15397: Update example to use non-deleted API.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/sdk/ruby/README b/sdk/ruby/README
index f72a3d1f71..95dbb12c8d 100644
--- a/sdk/ruby/README
+++ b/sdk/ruby/README
@@ -21,8 +21,8 @@ ENV['ARVADOS_API_TOKEN'] = 'qwertyuiopasdfghjklzxcvbnm1234567890abcdefghijklmn'
require 'arvados'
arv = Arvados.new( { :suppress_ssl_warnings => false } )
-pt_list = arv.pipeline_template.list(where:{})
-puts pt_list[:items].first.inspect
+cr_list = arv.container_request.list(where:{})
+puts cr_list[:items].first.inspect
-pt = arv.pipeline_template.get(uuid:"9zb4a-p5p6p-fkkbrl98u3pk87m")
+cr = arv.container_request.get(uuid:"zzzzz-xvhdp-fkkbrl98u3pk87m")
puts pt.inspect
commit fff7dfd72ee4000c5148471c74659beed88ad3c6
Author: Tom Clegg <tom at curii.com>
Date: Mon May 20 10:53:05 2024 -0400
15397: Remove structs for deleted APIs.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/sdk/go/arvados/job.go b/sdk/go/arvados/job.go
deleted file mode 100644
index 1daf07154d..0000000000
--- a/sdk/go/arvados/job.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package arvados
-
-import "time"
-
-// Job is an arvados#job record
-type Job struct {
- UUID string `json:"uuid"`
- Etag string `json:"etag"`
- OwnerUUID string `json:"owner_uuid"`
- ModifiedByClientUUID string `json:"modified_by_client_uuid"`
- ModifiedByUserUUID string `json:"modified_by_user_uuid"`
- ModifiedAt time.Time `json:"modified_at"`
- SubmitID string `json:"submit_id"`
- Script string `json:"script"`
- CancelledByClientUUID string `json:"cancelled_by_client_uuid"`
- CancelledByUserUUID string `json:"cancelled_by_user_uuid"`
- CancelledAt time.Time `json:"cancelled_at"`
- StartedAt time.Time `json:"started_at"`
- FinishedAt time.Time `json:"finished_at"`
- Running bool `json:"running"`
- Success bool `json:"success"`
- Output string `json:"output"`
- CreatedAt time.Time `json:"created_at"`
- IsLockedByUUID string `json:"is_locked_by_uuid"`
- Log string `json:"log"`
- TasksSummary map[string]interface{} `json:"tasks_summary"`
- RuntimeConstraints map[string]interface{} `json:"runtime_constraints"`
- Nondeterministic bool `json:"nondeterministic"`
- Repository string `json:"repository"`
- SuppliedScriptVersion string `json:"supplied_script_version"`
- DockerImageLocator string `json:"docker_image_locator"`
- Priority int `json:"priority"`
- Description string `json:"description"`
- State string `json:"state"`
- ArvadosSDKVersion string `json:"arvados_sdk_version"`
- Components map[string]interface{} `json:"components"`
- ScriptParametersDigest string `json:"script_parameters_digest"`
- WritableBy []string `json:"writable_by,omitempty"`
-}
-
-func (g Job) resourceName() string {
- return "job"
-}
diff --git a/sdk/go/arvados/pipeline_instance.go b/sdk/go/arvados/pipeline_instance.go
deleted file mode 100644
index 507982647c..0000000000
--- a/sdk/go/arvados/pipeline_instance.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package arvados
-
-import "time"
-
-// PipelineInstance is an arvados#pipelineInstance record
-type PipelineInstance struct {
- UUID string `json:"uuid"`
- Etag string `json:"etag"`
- OwnerUUID string `json:"owner_uuid"`
- CreatedAt time.Time `json:"created_at"`
- ModifiedByClientUUID string `json:"modified_by_client_uuid"`
- ModifiedByUserUUID string `json:"modified_by_user_uuid"`
- ModifiedAt time.Time `json:"modified_at"`
- PipelineTemplateUUID string `json:"pipeline_template_uuid"`
- Name string `json:"name"`
- Components map[string]interface{} `json:"components"`
- Properties map[string]interface{} `json:"properties"`
- State string `json:"state"`
- ComponentsSummary map[string]interface{} `json:"components_summary"`
- StartedAt time.Time `json:"started_at"`
- FinishedAt time.Time `json:"finished_at"`
- Description string `json:"description"`
- WritableBy []string `json:"writable_by,omitempty"`
-}
-
-func (g PipelineInstance) resourceName() string {
- return "pipelineInstance"
-}
diff --git a/sdk/go/arvados/pipeline_template.go b/sdk/go/arvados/pipeline_template.go
deleted file mode 100644
index 259f12513b..0000000000
--- a/sdk/go/arvados/pipeline_template.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package arvados
-
-import "time"
-
-// PipelineTemplate is an arvados#pipelineTemplate record
-type PipelineTemplate struct {
- UUID string `json:"uuid"`
- Etag string `json:"etag"`
- OwnerUUID string `json:"owner_uuid"`
- CreatedAt time.Time `json:"created_at"`
- ModifiedByClientUUID string `json:"modified_by_client_uuid"`
- ModifiedByUserUUID string `json:"modified_by_user_uuid"`
- ModifiedAt time.Time `json:"modified_at"`
- Name string `json:"name"`
- Components map[string]interface{} `json:"components"`
- Description string `json:"description"`
- WritableBy []string `json:"writable_by,omitempty"`
-}
-
-func (g PipelineTemplate) resourceName() string {
- return "pipelineTemplate"
-}
diff --git a/sdk/go/arvados/trait.go b/sdk/go/arvados/trait.go
deleted file mode 100644
index 88e7640bed..0000000000
--- a/sdk/go/arvados/trait.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (C) The Arvados Authors. All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package arvados
-
-import "time"
-
-// Trait is an arvados#trait record
-type Trait struct {
- UUID string `json:"uuid"`
- Etag string `json:"etag"`
- OwnerUUID string `json:"owner_uuid"`
- CreatedAt time.Time `json:"created_at"`
- ModifiedByClientUUID string `json:"modified_by_client_uuid"`
- ModifiedByUserUUID string `json:"modified_by_user_uuid"`
- ModifiedAt time.Time `json:"modified_at"`
- Name string `json:"name"`
- Properties map[string]interface{} `json:"properties"`
- WritableBy []string `json:"writable_by,omitempty"`
-}
-
-func (g Trait) resourceName() string {
- return "trait"
-}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list