Page MenuHomeSoftware Heritage
Differential D299

deploy/worker: Permit to use specific /tmp folder for worker service
ClosedPublic
Actions

Authored by ardumont on Feb 16 2018, 6:42 PM.

Details

Reviewers
olasd
Commits
rSPSITE76a948bf7cb6: deploy/worker: Fix checking variable existence pattern
rSPSITE5092232d7750: deploy/worker: Permit to use specific /tmp folder for worker service
rSPSITE1b45ece87d75: deploy/worker: Remove empty line
rSPPROF5092232d7750: deploy/worker: Permit to use specific /tmp folder for worker service
rSPPROF76a948bf7cb6: deploy/worker: Fix checking variable existence pattern
rSPPROF1b45ece87d75: deploy/worker: Remove empty line
Summary

That way, no more dangling files when restarting/stopping the service.

Doc: https://www.freedesktop.org/software/systemd/man/systemd.exec.html#PrivateTmp=

Diff Detail

Repository
rSPPROF puppet-swh-profile
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 1181
Build 1525: arc lint + arc unit

Event Timeline

ardumont created this revision.Feb 16 2018, 6:42 PM
Harbormaster completed remote builds in B1181: Diff 996.Feb 16 2018, 6:42 PM
ardumont updated this revision to Diff 997.Feb 16 2018, 7:02 PM

Adapt according to remarks

  • deploy/worker: Fix checking variable existence pattern
  • deploy/worker: Permit to use specific /tmp folder for worker service
Closed by commit rSPPROF1b45ece87d75: deploy/worker: Remove empty line (authored by ardumont). · Explain WhyFeb 16 2018, 7:07 PM
This revision was automatically updated to reflect the committed changes.
ardumont added inline comments.Feb 16 2018, 7:15 PM
templates/swh/deploy/worker/parameters.conf.erb
12

Should be PrivateTmp.
This is fixed.

Revision Contents
Changeset List

PathSize
manifests/
swh/
deploy/
worker/
3 lines
2 lines
1 line
templates/
swh/
deploy/
worker/
3 lines

Diff 996

View Options

manifests/swh/deploy/worker/instance.pp

# Instance of a worker # Instance of a worker
define profile::swh::deploy::worker::instance ( define profile::swh::deploy::worker::instance (
$ensure = present, $ensure = present,
$task_broker = '', $task_broker = '',
$task_modules = [], $task_modules = [],
$task_queues = [], $task_queues = [],
$task_soft_time_limit = 0, $task_soft_time_limit = 0,
$concurrency = 10, $concurrency = 10,
$loglevel = 'info', $loglevel = 'info',
$max_tasks_per_child = 5, $max_tasks_per_child = 5,
$instance_name = $title, $instance_name = $title,
$limit_no_file = 'None') $limit_no_file = 'None',
$private_tmp = 'None')
{ {
include ::profile::swh::deploy::worker::base include ::profile::swh::deploy::worker::base
include ::systemd include ::systemd
$service_basename = "swh-worker@${instance_name}" $service_basename = "swh-worker@${instance_name}"
$service_name = "${service_basename}.service" $service_name = "${service_basename}.service"
$systemd_dir = "/etc/systemd/system/${service_name}.d" $systemd_dir = "/etc/systemd/system/${service_name}.d"
$systemd_snippet = "${systemd_dir}/parameters.conf" $systemd_snippet = "${systemd_dir}/parameters.conf"
▲ Show 20 Lines • Show All 96 Lines • Show Last 20 Lines
View Options

manifests/swh/deploy/worker/swh_loader_mercurial.pp

# Deployment for swh-loader-mercurial (disk) # Deployment for swh-loader-mercurial (disk)
class profile::swh::deploy::worker::swh_loader_mercurial { class profile::swh::deploy::worker::swh_loader_mercurial {
include ::profile::swh::deploy::base_loader_git include ::profile::swh::deploy::base_loader_git
$concurrency = hiera('swh::deploy::worker::swh_loader_mercurial::concurrency') $concurrency = hiera('swh::deploy::worker::swh_loader_mercurial::concurrency')
$loglevel = hiera('swh::deploy::worker::swh_loader_mercurial::loglevel') $loglevel = hiera('swh::deploy::worker::swh_loader_mercurial::loglevel')
$task_broker = hiera('swh::deploy::worker::swh_loader_mercurial::task_broker') $task_broker = hiera('swh::deploy::worker::swh_loader_mercurial::task_broker')
$config_file = '/etc/softwareheritage/loader/hg.yml' $config_file = '/etc/softwareheritage/loader/hg.yml'
$config = hiera('swh::deploy::worker::swh_loader_mercurial::config') $config = hiera('swh::deploy::worker::swh_loader_mercurial::config')
$task_modules = ['swh.loader.mercurial.tasks'] $task_modules = ['swh.loader.mercurial.tasks']
$task_queues = ['swh_loader_mercurial', 'swh_loader_mercurial_archive'] $task_queues = ['swh_loader_mercurial', 'swh_loader_mercurial_archive']
$service_name = 'swh_loader_mercurial' $service_name = 'swh_loader_mercurial'
$packages = ['python3-swh.loader.mercurial'] $packages = ['python3-swh.loader.mercurial']
package {$packages: package {$packages:
ensure => 'latest', ensure => 'latest',
notify => Service["swh-worker@$service_name"] notify => Service["swh-worker@$service_name"]
} }
::profile::swh::deploy::worker::instance {$service_name: ::profile::swh::deploy::worker::instance {$service_name:
ensure => running, ensure => running,
concurrency => $concurrency, concurrency => $concurrency,
loglevel => $loglevel, loglevel => $loglevel,
task_broker => $task_broker, task_broker => $task_broker,
task_modules => $task_modules, task_modules => $task_modules,
task_queues => $task_queues, task_queues => $task_queues,
private_tmp => true,
require => [ require => [
File[$config_file], File[$config_file],
], ],
} }
file {$config_file: file {$config_file:
ensure => 'present', ensure => 'present',
owner => 'swhworker', owner => 'swhworker',
group => 'swhworker', group => 'swhworker',
mode => '0644', mode => '0644',
content => inline_template("<%= @config.to_yaml %>\n"), content => inline_template("<%= @config.to_yaml %>\n"),
} }
} }
View Options

manifests/swh/deploy/worker/swh_loader_svn.pp

Show All 19 Linesclass profile::swh::deploy::worker::swh_loader_svn {
::profile::swh::deploy::worker::instance {'swh_loader_svn': ::profile::swh::deploy::worker::instance {'swh_loader_svn':
ensure => present, ensure => present,
concurrency => $concurrency, concurrency => $concurrency,
loglevel => $loglevel, loglevel => $loglevel,
task_broker => $task_broker, task_broker => $task_broker,
task_modules => $task_modules, task_modules => $task_modules,
task_queues => $task_queues, task_queues => $task_queues,
limit_no_file => $limit_no_file, limit_no_file => $limit_no_file,
private_tmp => true,
require => [ require => [
Package[$packages], Package[$packages],
File[$config_file], File[$config_file],
], ],
} }
file {$config_file: file {$config_file:
ensure => 'present', ensure => 'present',
owner => 'swhworker', owner => 'swhworker',
group => 'swhworker', group => 'swhworker',
mode => '0644', mode => '0644',
content => inline_template("<%= @config.to_yaml %>\n"), content => inline_template("<%= @config.to_yaml %>\n"),
} }
} }
View Options

templates/swh/deploy/worker/parameters.conf.erb

# Managed by puppet - modifications will be overwritten # Managed by puppet - modifications will be overwritten
# In defined class profile::swh::deploy::worker::instance # In defined class profile::swh::deploy::worker::instance
[Service] [Service]
Environment=CONCURRENCY=<%= @concurrency %> Environment=CONCURRENCY=<%= @concurrency %>
Environment=MAX_TASKS_PER_CHILD=<%= @max_tasks_per_child %> Environment=MAX_TASKS_PER_CHILD=<%= @max_tasks_per_child %>
Environment=LOGLEVEL=<%= @loglevel %> Environment=LOGLEVEL=<%= @loglevel %>
<% if @limit_no_file != 'None' %> <% if @limit_no_file != 'None' %>
LimitNOFILE=<%= @limit_no_file %> LimitNOFILE=<%= @limit_no_file %>
<% end %> <% end %>
<% if @private_tmp != 'None' %>
TmpPrivate=<%= @private_tmp %>
ardumontAuthorUnsubmitted
Not Done
Inline Actions

Should be PrivateTmp.
This is fixed.

ardumont: Should be `PrivateTmp`. This is fixed.
<% end %>
About · Developer information · Legal