openstack/devstack
Code Issues Proposed changes

Re-enable memory_tracker

Browse Source 
The old peakmem_tracker service has been disabled in [0], now enable
the replacement memory_tracker.

Also fail when the old service is still configured, otherwise
consumers might never notice.

Depends-On: https://review.opendev.org/739995
Change-Id: I583caf3f36a8ff41d7d4106dabc6c5f24243085e
This commit is contained in:
Jens Harbott 2019-02-21 12:24:17 +00:00 committed by Jens Harbott (frickler)
parent 2ecd182385
commit 95634d9905
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.zuul.yaml
View File

@ -404,6 +404,7 @@
# Shared services # Shared services
dstat: true dstat: true
etcd3: true etcd3: true
memory_tracker: true
mysql: true mysql: true
rabbit: true rabbit: true
group-vars: group-vars:
@ -411,6 +412,7 @@
devstack_services: devstack_services:
# Shared services # Shared services
dstat: true dstat: true
memory_tracker: true
devstack_localrc: devstack_localrc:
# Multinode specific settings # Multinode specific settings
HOST_IP: "{{ hostvars[inventory_hostname]['nodepool']['private_ipv4'] }}" HOST_IP: "{{ hostvars[inventory_hostname]['nodepool']['private_ipv4'] }}"
@ -476,6 +478,7 @@
# Shared services # Shared services
dstat: true dstat: true
etcd3: true etcd3: true
memory_tracker: true
mysql: true mysql: true
rabbit: true rabbit: true
tls-proxy: true tls-proxy: true
@ -524,6 +527,7 @@
# This list replaces the test-matrix. # This list replaces the test-matrix.
# Shared services # Shared services
dstat: true dstat: true
memory_tracker: true
tls-proxy: true tls-proxy: true
# Nova services # Nova services
n-cpu: true n-cpu: true

6
lib/dstat
View File

@ -35,10 +35,10 @@ function start_dstat {
# to your localrc # to your localrc
run_process memory_tracker "$TOP_DIR/tools/memory_tracker.sh" "" "root" run_process memory_tracker "$TOP_DIR/tools/memory_tracker.sh" "" "root"
# remove support for the old name when it's no longer used (sometime in Queens) # TODO(jh): Fail when using the old service name otherwise consumers might
# never notice that is has been removed.
if is_service_enabled peakmem_tracker; then if is_service_enabled peakmem_tracker; then
deprecated "Use of peakmem_tracker in devstack is deprecated, use memory_tracker instead" die $LINENO "The peakmem_tracker service has been removed, use memory_tracker instead"
run_process peakmem_tracker "$TOP_DIR/tools/memory_tracker.sh" "" "root"
fi fi
} }