Skip to content

Commit 95634d9

Browse files
committed
Re-enable memory_tracker
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
1 parent 2ecd182 commit 95634d9

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.zuul.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,13 +404,15 @@
404404
# Shared services
405405
dstat: true
406406
etcd3: true
407+
memory_tracker: true
407408
mysql: true
408409
rabbit: true
409410
group-vars:
410411
subnode:
411412
devstack_services:
412413
# Shared services
413414
dstat: true
415+
memory_tracker: true
414416
devstack_localrc:
415417
# Multinode specific settings
416418
HOST_IP: "{{ hostvars[inventory_hostname]['nodepool']['private_ipv4'] }}"
@@ -476,6 +478,7 @@
476478
# Shared services
477479
dstat: true
478480
etcd3: true
481+
memory_tracker: true
479482
mysql: true
480483
rabbit: true
481484
tls-proxy: true
@@ -524,6 +527,7 @@
524527
# This list replaces the test-matrix.
525528
# Shared services
526529
dstat: true
530+
memory_tracker: true
527531
tls-proxy: true
528532
# Nova services
529533
n-cpu: true

lib/dstat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ function start_dstat {
3535
# to your localrc
3636
run_process memory_tracker "$TOP_DIR/tools/memory_tracker.sh" "" "root"
3737

38-
# remove support for the old name when it's no longer used (sometime in Queens)
38+
# TODO(jh): Fail when using the old service name otherwise consumers might
39+
# never notice that is has been removed.
3940
if is_service_enabled peakmem_tracker; then
40-
deprecated "Use of peakmem_tracker in devstack is deprecated, use memory_tracker instead"
41-
run_process peakmem_tracker "$TOP_DIR/tools/memory_tracker.sh" "" "root"
41+
die $LINENO "The peakmem_tracker service has been removed, use memory_tracker instead"
4242
fi
4343
}
4444

0 commit comments

Comments
 (0)