GitList

Browse code

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

Ian Wienand authored on 2015/10/13 09:03:03
Showing 63 changed files

functions index 34da1ba..762fc47 100644
functions-common index 6a065ba..d68ae77 100644
inc/meta-config index b9ab6b2..b6fe437 100644
lib/apache index 17526c7..c9e02a2 100644
lib/ceph index f573136..4ac498a 100644
lib/cinder index 1307c11..70b198c 100644
lib/cinder_backends/ceph index 7e9d2d3..c21350b 100644
lib/cinder_backends/glusterfs index 00c62e0..4e34f8e 100644
lib/cinder_backends/lvm index 411b82c..d927f9c 100644
lib/cinder_backends/netapp_iscsi index be9442e..5cce30a 100644
lib/cinder_backends/netapp_nfs index dc919ad..7ba36d2 100644
lib/cinder_backends/nfs index fc51b2b..89a37a1 100644
lib/cinder_backends/solidfire index 7cc70fc..16bc527 100644
lib/cinder_backends/vmdk index d5b9453..3a6a5cf 100644
lib/cinder_backends/xiv index 6eadaae..e8b5da0 100644
lib/cinder_plugins/XenAPINFS index f730695..92135e7 100644
lib/cinder_plugins/glusterfs index 35ceb27..329dd6c 100644
lib/cinder_plugins/nfs index 83b3993..6e4ffe0 100644
lib/cinder_plugins/sheepdog index ca343f7..558de46 100644
lib/cinder_plugins/vsphere index f14ddf0..1b28ffe 100644
lib/database index 13740b9..0d72052 100644
lib/databases/mysql index cc74b33..1bbbd62 100644
lib/databases/postgresql index 78c7bed..913e8ff 100644
lib/dlm index 95e9b0a..74eb67e 100644
lib/dstat index fe4790b..b705948 100644
lib/glance index 2eb93a4..eb5832e 100644
lib/heat index e42bdf0..54666a5 100644
lib/horizon index ff63b06..67181fc 100644
lib/infra index ab32efe..cf003cc 100644
lib/ironic index 6a32983..23d8dda 100644
lib/keystone index 5a2afbf..b19202b 100644
lib/ldap index 0414fea..65056ae 100644
lib/lvm index 468a99a..ae6023a 100644
lib/neutron-legacy index 978943d..d00630a 100644
lib/neutron_plugins/bigswitch_floodlight index f52105e..586ded7 100644
lib/neutron_plugins/brocade index 953360e..6ba0a66 100644
lib/neutron_plugins/cisco index 7d0cf1a..fc2cb8a 100644
lib/neutron_plugins/embrane index 2028496..385dab8 100644
lib/neutron_plugins/linuxbridge_agent index f28bcfe..096722b 100644
lib/neutron_plugins/ml2 index ace5335..30e1b03 100644
lib/neutron_plugins/nuage index 9e5307b..61e634e 100644
lib/neutron_plugins/openvswitch index 891ab49..130eaac 100644
lib/neutron_plugins/openvswitch_agent index 6a33393..b1acacd 100644
lib/neutron_plugins/ovs_base index d3fd198..91aff33 100644
lib/neutron_plugins/services/firewall index 3496da8..1d81a21 100644
lib/neutron_plugins/services/loadbalancer index 7865f6f..b07d06c 100644
lib/neutron_plugins/services/metering index c75ab19..5fd2fdc 100644
lib/neutron_plugins/services/vpn index c0e7457..8a379f5 100644
lib/neutron_thirdparty/bigswitch_floodlight index e3f4689..45a4f2e 100644
lib/nova index ba05f53..e571293 100644
lib/nova_plugins/functions-libvirt index 045fc8b..dae55c6 100644
lib/nova_plugins/hypervisor-fake index 3180d91..2434dce 100644
lib/nova_plugins/hypervisor-ironic index b9e286d..c6ed85d 100644
lib/nova_plugins/hypervisor-libvirt index c54a716..8bbaa21 100644
lib/nova_plugins/hypervisor-openvz index cce36b8..58ab5c1 100644
lib/nova_plugins/hypervisor-vsphere index 698f836..7c08bc9 100644
lib/nova_plugins/hypervisor-xenserver index e097990..3eb9149 100644
lib/oslo index 56615fa..3d6fbb3 100644
lib/rpc_backend index 298dcb6..3864ade 100644
lib/swift index d7ccc24..b596142 100644
lib/tempest index 76fd6ca..85e0e7f 100644
lib/template index 2703788..08d10bb 100644
stack.sh index 8625b5a..19d05c9 100755

@@ -22,7 +22,7 @@ source ${FUNC_DIR}/inc/python
                      source ${FUNC_DIR}/inc/rootwrap
                      # Save trace setting
                     -XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_FUNCTIONS=$(set +o | grep xtrace)
                      set +o xtrace
                      # Check if a function already exists
@@ -603,7 +603,7 @@ function create_disk {
+                     }
                      # Restore xtrace
                     -$XTRACE
                     +$_XTRACE_FUNCTIONS
                      # Local variables:
                      # mode: shell-script

@@ -20,7 +20,7 @@
                      # file-name is the destination of the config file
                      # Save trace setting
                     -INC_META_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_INC_META=$(set +o | grep xtrace)
                      set +o xtrace
@@ -197,7 +197,7 @@ function merge_config_group {
                      # Restore xtrace
                     -$INC_META_XTRACE
                     +$_XTRACE_INC_META
                      # Local variables:
                      # mode: shell-script

@@ -19,7 +19,7 @@
                      # - restart_apache_server
                      # Save trace setting
                     -XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_LIB_APACHE=$(set +o | grep xtrace)
                      set +o xtrace
                      # Allow overriding the default Apache user and group, default to
@@ -191,7 +191,7 @@ function restart_apache_server {
+                     }
                      # Restore xtrace
                     -$XTRACE
                     +$_XTRACE_LIB_APACHE
                      # Tell emacs to use shell-script-mode
                      ## Local variables:

@@ -18,7 +18,7 @@
                      # - cleanup_ceph
                      # Save trace setting
                     -XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_LIB_CEPH=$(set +o | grep xtrace)
                      set +o xtrace
@@ -375,7 +375,7 @@ function stop_ceph {
                      # Restore xtrace
                     -$XTRACE
                     +$_XTRACE_LIB_CEPH
                      ## Local variables:
                      ## mode: shell-script

@@ -17,7 +17,7 @@
                      # configure_cinder_driver - make configuration changes, including those to other services
                      # Save trace setting
                     -MY_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_CINDER_SOLIDFIRE=$(set +o | grep xtrace)
                      set +o xtrace
@@ -42,7 +42,7 @@ function configure_cinder_backend_solidfire {
                      # Restore xtrace
                     -$MY_XTRACE
                     +$_XTRACE_CINDER_SOLIDFIRE
                      # Local variables:
                      # mode: shell-script

@@ -15,7 +15,7 @@
                      # configure_cinder_backend_vmdk - Configure Cinder for VMware vmdk backends
                      # Save trace setting
                     -VMDK_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_CINDER_VMDK=$(set +o | grep xtrace)
                      set +o xtrace
@@ -40,7 +40,7 @@ function configure_cinder_backend_vmdk {
                      # Restore xtrace
                     -$VMDK_XTRACE
                     +$_XTRACE_CINDER_VMDK
                      # Local variables:
                      # mode: shell-script

@@ -42,7 +42,7 @@
                      # configure_cinder_backend_xiv - Configure Cinder for xiv backends
                      # Save trace setting
                     -XIV_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_CINDER_XIV=$(set +o | grep xtrace)
                      set +o xtrace
                      # Defaults
@@ -79,7 +79,7 @@ function configure_cinder_backend_xiv {
+                     }
                      # Restore xtrace
                     -$XIV_XTRACE
                     +$_XTRACE_CINDER_XIV
                      # Local variables:
                      # mode: shell-script

@@ -8,7 +8,7 @@
                      # - DATABASE_{HOST,USER,PASSWORD} must be defined
                      # Save trace setting
                     -PG_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_PG=$(set +o | grep xtrace)
                      set +o xtrace
@@ -119,7 +119,7 @@ function database_connection_url_postgresql {
                      # Restore xtrace
                     -$PG_XTRACE
                     +$_XTRACE_PG
                      # Local variables:
                      # mode: shell-script

@@ -13,7 +13,7 @@
                      # - stop_dstat
                      # Save trace setting
                     -XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_DSTAT=$(set +o | grep xtrace)
                      set +o xtrace
                      # start_dstat() - Start running processes, including screen
@@ -34,4 +34,4 @@ function stop_dstat {
+                     }
                      # Restore xtrace
                     -$XTRACE
                     +$_XTRACE_DSTAT

@@ -21,8 +21,8 @@
                      # - cleanup_ironic
                      # Save trace and pipefail settings
                     -XTRACE=$(set +o | grep xtrace)
                     -PIPEFAIL=$(set +o | grep pipefail)
                     +_XTRACE_IRONIC=$(set +o | grep xtrace)
                     +_PIPEFAIL_IRONIC=$(set +o | grep pipefail)
                      set +o xtrace
                      set +o pipefail
@@ -855,8 +855,8 @@ function cleanup_baremetal_basic_ops {
+                     }
                      # Restore xtrace + pipefail
                     -$XTRACE
                     -$PIPEFAIL
                     +$_XTRACE_IRONIC
                     +$_PIPEFAIL_IRONIC
                      # Tell emacs to use shell-script-mode
                      ## Local variables:

@@ -4,7 +4,7 @@
                      # ------------------------------------
                      # Save trace setting
                     -BS_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_NEUTRON_BIGSWITCH=$(set +o | grep xtrace)
                      set +o xtrace
                      source $TOP_DIR/lib/neutron_plugins/ovs_base
@@ -75,4 +75,4 @@ function neutron_plugin_check_adv_test_requirements {
+                     }
                      # Restore xtrace
                     -$BS_XTRACE
                     +$_XTRACE_NEUTRON_BIGSWITCH

@@ -4,7 +4,7 @@
                      # ----------------------
                      # Save trace setting
                     -BRCD_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_NEUTRON_BROCADE=$(set +o | grep xtrace)
                      set +o xtrace
                      function is_neutron_ovs_base_plugin {
@@ -81,4 +81,4 @@ function neutron_plugin_check_adv_test_requirements {
+                     }
                      # Restore xtrace
                     -$BRCD_XTRACE
                     +$_XTRACE_NEUTRON_BROCADE

@@ -4,7 +4,7 @@
                      # ---------------------------
                      # Save trace setting
                     -CISCO_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_NEUTRON_CISCO=$(set +o | grep xtrace)
                      set +o xtrace
                      # Scecify the VSM parameters
@@ -154,4 +154,4 @@ function neutron_plugin_setup_interface_driver {
+                     }
                      # Restore xtrace
                     -$CISCO_XTRACE
                     +$_XTRACE_NEUTRON_CISCO

@@ -4,7 +4,7 @@
                      # ---------------------------
                      # Save trace setting
                     -EMBR_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_NEUTRON_EMBR=$(set +o | grep xtrace)
                      set +o xtrace
                      source $TOP_DIR/lib/neutron_plugins/openvswitch
@@ -39,4 +39,5 @@ function neutron_plugin_configure_service {
+                     }
                      # Restore xtrace
                     -$EMBR_XTRACE
                     +$_XTRACE_NEUTRON_EMBR
+                    +

@@ -4,7 +4,7 @@
                      # -----------------------------
                      # Save trace setting
                     -PLUGIN_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_NEUTRON_LB=$(set +o | grep xtrace)
                      set +o xtrace
                      function neutron_lb_cleanup {
@@ -93,4 +93,4 @@ function neutron_plugin_check_adv_test_requirements {
+                     }
                      # Restore xtrace
                     -$PLUGIN_XTRACE
                     +$_XTRACE_NEUTRON_LB

@@ -4,7 +4,7 @@
                      # ------------------------------
                      # Save trace setting
                     -ML2_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_NEUTRON_ML2=$(set +o | grep xtrace)
                      set +o xtrace
                      # Enable this to simply and quickly enable tunneling with ML2.
@@ -137,4 +137,4 @@ function has_neutron_plugin_security_group {
+                     }
                      # Restore xtrace
                     -$ML2_XTRACE
                     +$_XTRACE_NEUTRON_ML2

@@ -4,7 +4,7 @@
                      # ----------------------
                      # Save trace setting
                     -NU_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_NEUTRON_NU=$(set +o | grep xtrace)
                      set +o xtrace
                      function neutron_plugin_create_nova_conf {
@@ -66,4 +66,4 @@ function has_neutron_plugin_security_group {
+                     }
                      # Restore xtrace
                     -$NU_XTRACE
                     +$_XTRACE_NEUTRON_NU

@@ -7,7 +7,7 @@
                      # which has been removed in Juno.
                      # Save trace setting
                     -OVS_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_NEUTRON_OVS=$(set +o | grep xtrace)
                      set +o xtrace
                      source $TOP_DIR/lib/neutron_plugins/openvswitch_agent
@@ -56,4 +56,5 @@ function has_neutron_plugin_security_group {
+                     }
                      # Restore xtrace
                     -$OVS_XTRACE
                     +$_XTRACE_NEUTRON_OVS
+                    +

@@ -4,7 +4,7 @@
                      # -------------------------------------
                      # Save trace setting
                     -OVSB_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_NEUTRON_OVS_BASE=$(set +o | grep xtrace)
                      set +o xtrace
                      OVS_BRIDGE=${OVS_BRIDGE:-br-int}
@@ -114,4 +114,4 @@ function _neutron_ovs_base_configure_nova_vif_driver {
+                     }
                      # Restore xtrace
                     -$OVSB_XTRACE
                     +$_XTRACE_NEUTRON_OVS_BASE

@@ -4,7 +4,7 @@
                      # ---------------------------
                      # Save trace setting
                     -FW_XTRACE=$(set +o | grep xtrace)
                     +_XTRACE_NEUTRON_FIREWALL=$(set +o | grep xtrace)
                      set +o xtrace
                      FWAAS_PLUGIN=neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin
@@ -26,4 +26,4 @@ function neutron_fwaas_stop {
+                     }
                      # Restore xtrace
                     -$FW_XTRACE
                     +$_XTRACE_NEUTRON_FIREWALL

@@ -573,7 +573,8 @@ run_phase source
                      # Generic helper to configure passwords
                      function read_password {
                     -    XTRACE=$(set +o | grep xtrace)
                     +    local xtrace
                     +    xtrace=$(set +o | grep xtrace)
                          set +o xtrace
                          var=$1; msg=$2
                          pw=${!var}
@@ -616,7 +617,9 @@ function read_password {
                              eval "$var=$pw"
                              echo "$var=$pw" >> $localrc
                          fi
                     -    $XTRACE
+                    +
                     +    # restore previous xtrace value
                     +    $xtrace
+                     }