opendev/system-config
Code Issues Proposed changes

Merge "Run fewer es queries with elastic_recheck."

Browse Source
This commit is contained in:
Jenkins 2014-02-19 02:39:54 +00:00 committed by Gerrit Code Review
commit c1da690ab9
2 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/elastic_recheck/manifests/cron.pp
View File

@ -25,7 +25,7 @@ class elastic_recheck::cron () {
cron { 'elastic-recheck-all':
user => 'recheck',
minute => '*/15',
minute => '0',
hour => '*',
command => "cd ${er_state_path} && er_safe_run.sh ${graph_all_cmd}",
environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin',
@ -34,9 +34,9 @@ class elastic_recheck::cron () {
cron { 'elastic-recheck-gate':
user => 'recheck',
minute => '*/15',
minute => '20',
hour => '*',
command => "sleep $((RANDOM\%60+90)) && cd ${er_state_path} && er_safe_run.sh ${graph_gate_cmd}",
command => "cd ${er_state_path} && er_safe_run.sh ${graph_gate_cmd}",
environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin',
require => Class['elastic_recheck']
}
@ -44,7 +44,7 @@ class elastic_recheck::cron () {
cron { 'elastic-recheck-uncat':
user => 'recheck',
minute => '59',
minute => '40',
hour => '*',
command => "cd ${er_state_path} && er_safe_run.sh ${uncat_cmd}",
environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin',

30
modules/elastic_recheck/manifests/init.pp
View File

@ -46,36 +46,6 @@ class elastic_recheck (
source => 'https://git.openstack.org/openstack-infra/elastic-recheck',
}
exec { 'run_er_graph_all':
command => "er_safe_run.sh ${graph_all_cmd}",
path => '/usr/local/bin:/usr/bin:/bin/',
cwd => $recheck_state_dir,
user => 'recheck',
refreshonly => true,
require => File['/usr/local/bin/er_safe_run.sh'],
subscribe => Vcsrepo['/opt/elastic-recheck'],
}
exec { 'run_er_graph_gate_only':
command => "er_safe_run.sh ${graph_gate_cmd}",
path => '/usr/local/bin:/usr/bin:/bin/',
cwd => $recheck_state_dir,
user => 'recheck',
refreshonly => true,
require => File['/usr/local/bin/er_safe_run.sh'],
subscribe => Vcsrepo['/opt/elastic-recheck'],
}
exec { 'run_er_uncat':
command => "er_safe_run.sh ${uncat_cmd}",
path => '/usr/local/bin:/usr/bin:/bin/',
cwd => $recheck_state_dir,
user => 'recheck',
refreshonly => true,
require => File['/usr/local/bin/er_safe_run.sh'],
subscribe => Vcsrepo['/opt/elastic-recheck'],
}
include pip
exec { 'install_elastic-recheck' :
command => 'pip install /opt/elastic-recheck',