Skip to content

Commit 523f488

Browse files
ianwianw
committed
Namespace XTRACE commands
I noticed this when debugging some grenade issues failures. An include of grenade/functions stores the current value of XTRACE (on) and disables xtrace for the rest of the import. We then include devstack's "functions" library, which now overwrites the stored value of XTRACE the current state; i.e. disabled. When it finishes it restores the prior state (disabled), and then grenade restores the same value of XTRACE (disabled). The result is that xtrace is incorrectly disabled until the next time it just happens to be turned on. The solution is to name-space the store of the current-value of xtrace so when we finish sourcing a file, we always restore the tracing value to what it was when we entered. Some files had already discovered this. In general there is inconsistency around the setting of the variable, and a lot of obvious copy-paste. This brings consistency across all files by using _XTRACE_* prefixes for the sotre/restore of tracing values. Change-Id: Iba7739eada5711d9c269cb4127fa712e9f961695
1 parent 307730a commit 523f488

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+134
-128
lines changed

‎functions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ source ${FUNC_DIR}/inc/python
2222
source ${FUNC_DIR}/inc/rootwrap
2323

2424
# Save trace setting
25-
XTRACE=$(set +o | grep xtrace)
25+
_XTRACE_FUNCTIONS=$(set +o | grep xtrace)
2626
set +o xtrace
2727

2828
# Check if a function already exists
@@ -603,7 +603,7 @@ function create_disk {
603603
}
604604

605605
# Restore xtrace
606-
$XTRACE
606+
$_XTRACE_FUNCTIONS
607607

608608
# Local variables:
609609
# mode: shell-script

‎functions-common‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#
3333

3434
# Save trace setting
35-
XTRACE=$(set +o | grep xtrace)
35+
_XTRACE_FUNCTIONS_COMMON=$(set +o | grep xtrace)
3636
set +o xtrace
3737

3838
# ensure we don't re-source this in the same environment
@@ -2254,7 +2254,7 @@ function time_totals {
22542254
}
22552255

22562256
# Restore xtrace
2257-
$XTRACE
2257+
$_XTRACE_FUNCTIONS_COMMON
22582258

22592259
# Local variables:
22602260
# mode: shell-script

‎inc/meta-config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# file-name is the destination of the config file
2121

2222
# Save trace setting
23-
INC_META_XTRACE=$(set +o | grep xtrace)
23+
_XTRACE_INC_META=$(set +o | grep xtrace)
2424
set +o xtrace
2525

2626

@@ -197,7 +197,7 @@ function merge_config_group {
197197

198198

199199
# Restore xtrace
200-
$INC_META_XTRACE
200+
$_XTRACE_INC_META
201201

202202
# Local variables:
203203
# mode: shell-script

‎lib/apache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# - restart_apache_server
2020

2121
# Save trace setting
22-
XTRACE=$(set +o | grep xtrace)
22+
_XTRACE_LIB_APACHE=$(set +o | grep xtrace)
2323
set +o xtrace
2424

2525
# Allow overriding the default Apache user and group, default to
@@ -191,7 +191,7 @@ function restart_apache_server {
191191
}
192192

193193
# Restore xtrace
194-
$XTRACE
194+
$_XTRACE_LIB_APACHE
195195

196196
# Tell emacs to use shell-script-mode
197197
## Local variables:

‎lib/ceph‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# - cleanup_ceph
1919

2020
# Save trace setting
21-
XTRACE=$(set +o | grep xtrace)
21+
_XTRACE_LIB_CEPH=$(set +o | grep xtrace)
2222
set +o xtrace
2323

2424

@@ -375,7 +375,7 @@ function stop_ceph {
375375

376376

377377
# Restore xtrace
378-
$XTRACE
378+
$_XTRACE_LIB_CEPH
379379

380380
## Local variables:
381381
## mode: shell-script

‎lib/cinder‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# - cleanup_cinder
2121

2222
# Save trace setting
23-
XTRACE=$(set +o | grep xtrace)
23+
_XTRACE_CINDER=$(set +o | grep xtrace)
2424
set +o xtrace
2525

2626

@@ -567,7 +567,7 @@ function create_cinder_volume_group {
567567

568568

569569
# Restore xtrace
570-
$XTRACE
570+
$_XTRACE_CINDER
571571

572572
# Tell emacs to use shell-script-mode
573573
## Local variables:

‎lib/cinder_backends/ceph‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323

2424
# Save trace setting
25-
MY_XTRACE=$(set +o | grep xtrace)
25+
_XTRACE_CINDER_CEPH=$(set +o | grep xtrace)
2626
set +o xtrace
2727

2828

@@ -76,7 +76,7 @@ function configure_cinder_backend_ceph {
7676
}
7777

7878
# Restore xtrace
79-
$MY_XTRACE
79+
$_XTRACE_CINDER_CEPH
8080

8181
# Local variables:
8282
# mode: shell-script

‎lib/cinder_backends/glusterfs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# configure_cinder_backend_glusterfs - Configure Cinder for GlusterFS backends
2020

2121
# Save trace setting
22-
GLUSTERFS_XTRACE=$(set +o | grep xtrace)
22+
_XTRACE_CINDER_GLUSTERFS=$(set +o | grep xtrace)
2323
set +o xtrace
2424

2525

@@ -41,7 +41,7 @@ function configure_cinder_backend_glusterfs {
4141

4242

4343
# Restore xtrace
44-
$GLUSTERFS_XTRACE
44+
$_XTRACE_CINDER_GLUSTERFS
4545

4646
# Local variables:
4747
# mode: shell-script

‎lib/cinder_backends/lvm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323

2424
# Save trace setting
25-
MY_XTRACE=$(set +o | grep xtrace)
25+
_XTRACE_CINDER_LVM=$(set +o | grep xtrace)
2626
set +o xtrace
2727

2828

@@ -68,7 +68,7 @@ function init_cinder_backend_lvm {
6868
}
6969

7070
# Restore xtrace
71-
$MY_XTRACE
71+
$_XTRACE_CINDER_LVM
7272

7373
# mode: shell-script
7474
# End:

‎lib/cinder_backends/netapp_iscsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# configure_cinder_backend_netapp_iscsi - configure iSCSI
2121

2222
# Save trace setting
23-
MY_XTRACE=$(set +o | grep xtrace)
23+
_XTRACE_CINDER_NETAPP=$(set +o | grep xtrace)
2424
set +o xtrace
2525

2626

@@ -59,7 +59,7 @@ function configure_cinder_backend_netapp_iscsi {
5959

6060

6161
# Restore xtrace
62-
$MY_XTRACE
62+
$_XTRACE_CINDER_NETAPP
6363

6464
# Local variables:
6565
# mode: shell-script

0 commit comments

Comments
 (0)