projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13996: More config migrations, refactor some code into config_loader.rb
[arvados.git]
/
services
/
api
/
app
/
models
/
node.rb
diff --git
a/services/api/app/models/node.rb
b/services/api/app/models/node.rb
index 3d8b91b4b62df590edd2c1049a5ea69e17224bef..bf569a2d81b775eb6a0bea234ba7509b55de8ee1 100644
(file)
--- a/
services/api/app/models/node.rb
+++ b/
services/api/app/models/node.rb
@@
-8,8
+8,12
@@
class Node < ArvadosModel
include HasUuid
include KindAndEtag
include CommonApiTemplate
include HasUuid
include KindAndEtag
include CommonApiTemplate
- serialize :info, Hash
- serialize :properties, Hash
+
+ # Posgresql JSONB columns should NOT be declared as serialized, Rails 5
+ # already know how to properly treat them.
+ attribute :properties, :jsonbHash, default: {}
+ attribute :info, :jsonbHash, default: {}
+
before_validation :ensure_ping_secret
after_update :dns_server_update
before_validation :ensure_ping_secret
after_update :dns_server_update
@@
-35,7
+39,7
@@
class Node < ArvadosModel
api_accessible :superuser, :extend => :user do |t|
t.add :first_ping_at
t.add :info
api_accessible :superuser, :extend => :user do |t|
t.add :first_ping_at
t.add :info
- t.add lambda { |x| Rails.configuration.
compute_node_nameservers
}, :as => :nameservers
+ t.add lambda { |x| Rails.configuration.
Containers["SLURM"]["Managed"]["ComputeNodeNameservers"]
}, :as => :nameservers
end
after_initialize do
end
after_initialize do
@@
-43,7
+47,7
@@
class Node < ArvadosModel
end
def domain
end
def domain
- super || Rails.configuration.
compute_node_domain
+ super || Rails.configuration.
Containers["SLURM"]["Managed"]["ComputeNodeDomain"]
end
def api_job_uuid
end
def api_job_uuid
@@
-139,7
+143,7
@@
class Node < ArvadosModel
protected
def assign_hostname
protected
def assign_hostname
- if self.hostname.nil? and Rails.configuration.
assign_node_hostname
+ if self.hostname.nil? and Rails.configuration.
Containers["SLURM"]["Managed"]["AssignNodeHostname"]
self.hostname = self.class.hostname_for_slot(self.slot_number)
end
end
self.hostname = self.class.hostname_for_slot(self.slot_number)
end
end
@@
-155,7
+159,7
@@
class Node < ArvadosModel
# query label:
'Node.available_slot_number',
# [col_id, val] for $1 vars:
# query label:
'Node.available_slot_number',
# [col_id, val] for $1 vars:
- [[nil, Rails.configuration.
max_compute_nodes
]],
+ [[nil, Rails.configuration.
Containers["MaxComputeVMs"]
]],
).rows.first.andand.first
end
).rows.first.andand.first
end
@@
-190,24
+194,25
@@
class Node < ArvadosModel
template_vars = {
hostname: hostname,
template_vars = {
hostname: hostname,
- uuid_prefix: Rails.configuration.
uuid_prefix
,
+ uuid_prefix: Rails.configuration.
ClusterID
,
ip_address: ip_address,
ptr_domain: ptr_domain,
}
ip_address: ip_address,
ptr_domain: ptr_domain,
}
- if Rails.configuration.dns_server_conf_dir and Rails.configuration.dns_server_conf_template
+ if (!Rails.configuration.Containers["SLURM"]["Managed"]["DNSServerConfDir"].empty? and
+ !Rails.configuration.Containers["SLURM"]["Managed"]["DNSServerConfTemplate"].empty?)
tmpfile = nil
begin
begin
tmpfile = nil
begin
begin
- template = IO.read(Rails.configuration.
dns_server_conf_template
)
+ template = IO.read(Rails.configuration.
Containers["SLURM"]["Managed"]["DNSServerConfTemplate"]
)
rescue IOError, SystemCallError => e
rescue IOError, SystemCallError => e
- logger.error "Reading #{Rails.configuration.
dns_server_conf_template
}: #{e.message}"
+ logger.error "Reading #{Rails.configuration.
Containers["SLURM"]["Managed"]["DNSServerConfTemplate"]
}: #{e.message}"
raise
end
raise
end
- hostfile = File.join Rails.configuration.
dns_server_conf_dir
, "#{hostname}.conf"
+ hostfile = File.join Rails.configuration.
Containers["SLURM"]["Managed"]["DNSServerConfDir"]
, "#{hostname}.conf"
Tempfile.open(["#{hostname}-", ".conf.tmp"],
Tempfile.open(["#{hostname}-", ".conf.tmp"],
- Rails.configuration.
dns_server_conf_dir
) do |f|
+ Rails.configuration.
Containers["SLURM"]["Managed"]["DNSServerConfDir"]
) do |f|
tmpfile = f.path
f.puts template % template_vars
end
tmpfile = f.path
f.puts template % template_vars
end
@@
-223,20
+228,21
@@
class Node < ArvadosModel
end
end
end
end
- if
Rails.configuration.dns_server_update_command
- cmd = Rails.configuration.
dns_server_update_command
% template_vars
+ if
!Rails.configuration.Containers["SLURM"]["Managed"]["DNSServerUpdateCommand"].empty?
+ cmd = Rails.configuration.
Containers["SLURM"]["Managed"]["DNSServerUpdateCommand"]
% template_vars
if not system cmd
logger.error "dns_server_update_command #{cmd.inspect} failed: #{$?}"
ok = false
end
end
if not system cmd
logger.error "dns_server_update_command #{cmd.inspect} failed: #{$?}"
ok = false
end
end
- if Rails.configuration.dns_server_conf_dir and Rails.configuration.dns_server_reload_command
- restartfile = File.join(Rails.configuration.dns_server_conf_dir, 'restart.txt')
+ if (!Rails.configuration.Containers["SLURM"]["Managed"]["DNSServerConfDir"].empty? and
+ !Rails.configuration.Containers["SLURM"]["Managed"]["DNSServerReloadCommand"].empty?)
+ restartfile = File.join(Rails.configuration.Containers["SLURM"]["Managed"]["DNSServerConfDir"], 'restart.txt')
begin
File.open(restartfile, 'w') do |f|
# Typically, this is used to trigger a dns server restart
begin
File.open(restartfile, 'w') do |f|
# Typically, this is used to trigger a dns server restart
- f.puts Rails.configuration.
dns_server_reload_command
+ f.puts Rails.configuration.
Containers["SLURM"]["Managed"]["DNSServerReloadCommand"]
end
rescue IOError, SystemCallError => e
logger.error "Unable to write #{restartfile}: #{e.message}"
end
rescue IOError, SystemCallError => e
logger.error "Unable to write #{restartfile}: #{e.message}"
@@
-248,7
+254,7
@@
class Node < ArvadosModel
end
def self.hostname_for_slot(slot_number)
end
def self.hostname_for_slot(slot_number)
- config = Rails.configuration.
assign_node_hostname
+ config = Rails.configuration.
Containers["SLURM"]["Managed"]["AssignNodeHostname"]
return nil if !config
return nil if !config
@@
-257,10
+263,13
@@
class Node < ArvadosModel
# At startup, make sure all DNS entries exist. Otherwise, slurmctld
# will refuse to start.
# At startup, make sure all DNS entries exist. Otherwise, slurmctld
# will refuse to start.
- if Rails.configuration.dns_server_conf_dir and Rails.configuration.dns_server_conf_template and Rails.configuration.assign_node_hostname
- (0..Rails.configuration.max_compute_nodes-1).each do |slot_number|
+ if (!Rails.configuration.Containers["SLURM"]["Managed"]["DNSServerConfDir"].empty? and
+ !Rails.configuration.Containers["SLURM"]["Managed"]["DNSServerConfTemplate"].empty? and
+ !Rails.configuration.Containers["SLURM"]["Managed"]["AssignNodeHostname"].empty?)
+
+ (0..Rails.configuration.Containers["MaxComputeVMs"]-1).each do |slot_number|
hostname = hostname_for_slot(slot_number)
hostname = hostname_for_slot(slot_number)
- hostfile = File.join Rails.configuration.
dns_server_conf_dir
, "#{hostname}.conf"
+ hostfile = File.join Rails.configuration.
Containers["SLURM"]["Managed"]["DNSServerConfDir"]
, "#{hostname}.conf"
if !File.exist? hostfile
n = Node.where(:slot_number => slot_number).first
if n.nil? or n.ip_address.nil?
if !File.exist? hostfile
n = Node.where(:slot_number => slot_number).first
if n.nil? or n.ip_address.nil?