Remove OPENSHIFT_PROFILE as we now integrate debug directly

Author: smarterclayton

HACKING.md

@@ -762,39 +762,20 @@ Note: Hosted API documentation can be found
 ## Performance debugging
 
 OpenShift integrates the go `pprof` tooling to make it easy to capture CPU and
-heap dumps for running systems.  The following modes are available for the
-`openshift` binary (including all the CLI variants):
+heap dumps for running systems.  The pprof endpoint is available at `/debug/pprof/`
+on the secured HTTPS port for the `openshift` binary:
 
-* `OPENSHIFT_PROFILE` environment variable:
-  * `cpu` - will start a CPU profile on startup and write `./cpu.pprof`.
-Contains samples for the entire run at the native sampling resolution (100hz).
-Note: CPU profiling for Go does not currently work on Mac OS X - the stats are
-not correctly sampled
-  * `mem` - generate a running heap dump that tracks allocations to
-`./mem.pprof`
-  * `block` -  will start a block wait time analysis and write `./block.pprof`
-  * `web` - start the pprof webserver in process at http://127.0.0.1:6060/debug/pprof
-(you can open this in a browser). This supports `OPENSHIFT_PROFILE_HOST=`
-and `OPENSHIFT_PROFILE_PORT=` to change default ip `127.0.0.1` and default port `6060`.
-
-In order to start the server in CPU profiling mode, run:
-
-    $ OPENSHIFT_PROFILE=cpu sudo ./_output/local/bin/linux/amd64/openshift start
-
-Or, if running OpenShift under systemd, append this to
-`/etc/sysconfig/atomic-openshift-{master,node}`
-
-    OPENSHIFT_PROFILE=cpu
+    $ oc get --raw /debug/pprof/profile --as=system:admin > cpu.pprof
 
 To view profiles, you use
 [pprof](http://goog-perftools.sourceforge.net/doc/cpu_profiler.html) which is
-part of `go tool`.  You must pass the binary you are debugging (for symbols)
-and a captured pprof.  For instance, to view a `cpu` profile from above, you
-would run OpenShift to completion, and then run:
+part of `go tool`.  You must pass the captured pprof file (for source lines
+you will need to build the binary locally).  For instance, to view a `cpu` profile 
+from above, you would run OpenShift to completion, and then run:
 
-    $ go tool pprof ./_output/local/bin/linux/amd64/openshift cpu.pprof
+    $ go tool pprof cpu.pprof
     or
-    $ go tool pprof $(which openshift) /var/lib/origin/cpu.pprof
+    $ go tool pprof /var/lib/origin/cpu.pprof
 
 This will open the `pprof` shell, and you can then run:
 
@@ -817,19 +798,18 @@ to launch a web browser window showing you where CPU time is going.
 `pprof` supports CLI arguments for looking at profiles in different ways -
 memory profiles by default show allocated space:
 
-    $ go tool pprof ./_output/local/bin/linux/amd64/openshift mem.pprof
+    $ go tool pprof mem.pprof
 
 but you can also see the allocated object counts:
 
-    $ go tool pprof --alloc_objects ./_output/local/bin/linux/amd64/openshift
-mem.pprof
+    $ go tool pprof --alloc_objects mem.pprof
 
 Finally, when using the `web` profile mode, you can have the go tool directly
-fetch your profiles via HTTP:
+fetch your profiles via HTTP for services that only expose their profiling 
+contents over an unsecured HTTP endpoint:
 
     # for a 30s CPU trace
-    $ go tool pprof ./_output/local/bin/linux/amd64/openshift
-http://127.0.0.1:6060/debug/pprof/profile
+    $ go tool pprof http://127.0.0.1:6060/debug/pprof/profile
 
     # for a snapshot heap dump at the current time, showing total allocations
     $ go tool pprof --alloc_space ./_output/local/bin/linux/amd64/openshift

hack/lib/start.sh

@@ -270,7 +270,7 @@ function os::start::master() {
 	os::log::debug "$( ps -ef | grep openshift )"
 
 	os::log::debug "Starting OpenShift server"
-	local openshift_env=( "OPENSHIFT_PROFILE=${OPENSHIFT_PROFILE:-web}" "OPENSHIFT_ON_PANIC=crash" )
+	local openshift_env=( "OPENSHIFT_ON_PANIC=crash" )
 	$(os::start::internal::openshift_executable) start master                                       \
 	                                             --loglevel=4                                       \
 	                                             --logspec='*importer=5'                            \

hack/test-cmd.sh

@@ -53,21 +53,6 @@ os::log::system::start
 # Prevent user environment from colliding with the test setup
 unset KUBECONFIG
 
-# handle profiling defaults
-profile="${OPENSHIFT_PROFILE-}"
-unset OPENSHIFT_PROFILE
-if [[ -n "${profile}" ]]; then
-    if [[ "${TEST_PROFILE-}" == "cli" ]]; then
-        export CLI_PROFILE="${profile}"
-    else
-        export WEB_PROFILE="${profile}"
-    fi
-else
-  export WEB_PROFILE=cpu
-fi
-
-# profile the web
-export OPENSHIFT_PROFILE="${WEB_PROFILE-}"
 export ALLOWED_REGISTRIES='[{"domainName":"172.30.30.30:5000"},{"domainName":"myregistry.com"},{"domainName":"registry.centos.org"},{"domainName":"docker.io"},{"domainName":"gcr.io"},{"domainName":"quay.io"},{"domainName":"*.redhat.com"},{"domainName":"*.docker.io"},{"domainName":"registry.redhat.io"}]'
 
 os::start::configure_server
@@ -79,9 +64,6 @@ os::test::junit::declare_suite_end
 
 os::start::master
 
-# profile the cli commands
-export OPENSHIFT_PROFILE="${CLI_PROFILE-}"
-
 os::start::registry
 
 export HOME="${FAKE_HOME_DIR}"

test/extended/alternate_certs.sh

@@ -45,7 +45,7 @@ os::util::sed "s/:7001$/:${ETCD_PEER_PORT}/g" master/master-config.yaml
 os::util::sed 's#^  namedCertificates: null#  namedCertificates: [{"certFile":"custom.crt","keyFile":"custom.key","names":["localhost"]}]#' master/master-config.yaml
 
 # Start master
-OPENSHIFT_PROFILE=web OPENSHIFT_ON_PANIC=crash openshift start master \
+OPENSHIFT_ON_PANIC=crash openshift start master \
  --config=master/master-config.yaml \
  --loglevel=4 \
 &>"${LOG_DIR}/openshift.log" &

test/extended/alternate_launches.sh

@@ -44,7 +44,7 @@ sudo env "PATH=${PATH}" OPENSHIFT_ON_PANIC=crash openshift start etcd \
 &>"${LOG_DIR}/os-etcdserver.log" &
 
 os::log::info "Starting api server"
-sudo env "PATH=${PATH}" OPENSHIFT_PROFILE=web OPENSHIFT_ON_PANIC=crash openshift start master api \
+sudo env "PATH=${PATH}" OPENSHIFT_ON_PANIC=crash openshift start master api \
  --config=${MASTER_CONFIG_DIR}/master-config.yaml \
  --loglevel=4 \
 &>"${LOG_DIR}/os-apiserver.log" &

test/old-start-configs/v1.0.0/test-end-to-end.sh

@@ -244,7 +244,7 @@ echo "[INFO] Create certificates for the OpenShift server"
 
 
 echo "[INFO] Starting OpenShift server"
-sudo env "PATH=${PATH}" OPENSHIFT_PROFILE=web OPENSHIFT_ON_PANIC=crash openshift start \
+sudo env "PATH=${PATH}" OPENSHIFT_ON_PANIC=crash openshift start \
 	--master-config=${MASTER_CONFIG_DIR}/master-config.yaml \
 	--node-config=${NODE_CONFIG_DIR}/node-config.yaml \
     --loglevel=4 \