git commit: PHOENIX-1151 Remove unnecessary tracing code

2014-08-07 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master 26fc3223d -> bf5194b1a


PHOENIX-1151 Remove unnecessary tracing code


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/bf5194b1
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/bf5194b1
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/bf5194b1

Branch: refs/heads/master
Commit: bf5194b1a5aea03935c33bb449df8c2105208773
Parents: 26fc322
Author: James Taylor 
Authored: Thu Aug 7 18:57:40 2014 -0700
Committer: James Taylor 
Committed: Thu Aug 7 18:57:40 2014 -0700

--
 .../coprocessor/BaseScannerRegionObserver.java  | 46 +++---
 .../org/apache/phoenix/trace/util/Tracing.java  | 63 
 2 files changed, 24 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bf5194b1/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
index db09306..379de36 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
@@ -30,9 +30,9 @@ import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.RegionScanner;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.schema.StaleRegionBoundaryCacheException;
-import org.apache.phoenix.trace.util.Tracing;
 import org.apache.phoenix.util.ServerUtil;
-import org.cloudera.htrace.Span;
+import org.cloudera.htrace.Trace;
+import org.cloudera.htrace.TraceScope;
 
 
 abstract public class BaseScannerRegionObserver extends BaseRegionObserver {
@@ -103,31 +103,33 @@ abstract public class BaseScannerRegionObserver extends 
BaseRegionObserver {
 public final RegionScanner postScannerOpen(
 final ObserverContext c, final Scan 
scan,
 final RegionScanner s) throws IOException {
-// turn on tracing, if its enabled
-final Span child = Tracing.childOnServer(scan, rawConf, 
SCANNER_OPENED_TRACE_INFO);
 try {
-RegionScanner scanner;
-boolean isApplicable = isRegionObserverFor(scan);
-if (isApplicable) {
-throwIfScanOutOfRegion(scan, c.getEnvironment().getRegion());
-scanner = doPostScannerOpen(c, scan, s);
-} else {
-scanner = s;
+if (!isRegionObserverFor(scan)) {
+return s;
 }
-scanner = new DelegateRegionScanner(scanner) {
-@Override
-public void close() throws IOException {
-if (child != null) {
-child.stop();
+throwIfScanOutOfRegion(scan, c.getEnvironment().getRegion());
+boolean success = false;
+// turn on tracing, if its enabled
+final TraceScope child = Trace.startSpan("Phoenix scanner openned 
on server");
+try {
+RegionScanner scanner = doPostScannerOpen(c, scan, s);
+scanner = new DelegateRegionScanner(scanner) {
+@Override
+public void close() throws IOException {
+if (child.getSpan() != null) {
+child.getSpan().stop();
+}
+delegate.close();
 }
-delegate.close();
+};
+success = true;
+return scanner;
+} finally {
+if (!success && child.getSpan() != null) {
+child.getSpan().stop();
 }
-};
-return scanner;
+} 
 } catch (Throwable t) {
-if (child != null) {
-child.stop();
-}
 
ServerUtil.throwIOException(c.getEnvironment().getRegion().getRegionNameAsString(),
 t);
 return null; // impossible
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/bf5194b1/phoenix-core/src/main/java/org/apache/phoenix/trace/util/Tracing.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/trace/util/Tracing.java 
b/phoenix-core/src/main/java/org/apache/phoenix/trace/util/Tracing.java
index 5913cfb..9b0079f 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/trace/util/Tracing.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/t

git commit: PHOENIX-1151 Remove unnecessary tracing code

2014-08-07 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 276921b65 -> c3bf33b5c


PHOENIX-1151 Remove unnecessary tracing code


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c3bf33b5
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c3bf33b5
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c3bf33b5

Branch: refs/heads/4.0
Commit: c3bf33b5ce8ea1a539c67f6b5382f5bd68c01b84
Parents: 276921b
Author: James Taylor 
Authored: Thu Aug 7 18:57:40 2014 -0700
Committer: James Taylor 
Committed: Thu Aug 7 20:55:48 2014 -0700

--
 .../coprocessor/BaseScannerRegionObserver.java  | 46 +++---
 .../org/apache/phoenix/trace/util/Tracing.java  | 63 
 2 files changed, 24 insertions(+), 85 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c3bf33b5/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
index db09306..379de36 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
@@ -30,9 +30,9 @@ import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.RegionScanner;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.schema.StaleRegionBoundaryCacheException;
-import org.apache.phoenix.trace.util.Tracing;
 import org.apache.phoenix.util.ServerUtil;
-import org.cloudera.htrace.Span;
+import org.cloudera.htrace.Trace;
+import org.cloudera.htrace.TraceScope;
 
 
 abstract public class BaseScannerRegionObserver extends BaseRegionObserver {
@@ -103,31 +103,33 @@ abstract public class BaseScannerRegionObserver extends 
BaseRegionObserver {
 public final RegionScanner postScannerOpen(
 final ObserverContext c, final Scan 
scan,
 final RegionScanner s) throws IOException {
-// turn on tracing, if its enabled
-final Span child = Tracing.childOnServer(scan, rawConf, 
SCANNER_OPENED_TRACE_INFO);
 try {
-RegionScanner scanner;
-boolean isApplicable = isRegionObserverFor(scan);
-if (isApplicable) {
-throwIfScanOutOfRegion(scan, c.getEnvironment().getRegion());
-scanner = doPostScannerOpen(c, scan, s);
-} else {
-scanner = s;
+if (!isRegionObserverFor(scan)) {
+return s;
 }
-scanner = new DelegateRegionScanner(scanner) {
-@Override
-public void close() throws IOException {
-if (child != null) {
-child.stop();
+throwIfScanOutOfRegion(scan, c.getEnvironment().getRegion());
+boolean success = false;
+// turn on tracing, if its enabled
+final TraceScope child = Trace.startSpan("Phoenix scanner openned 
on server");
+try {
+RegionScanner scanner = doPostScannerOpen(c, scan, s);
+scanner = new DelegateRegionScanner(scanner) {
+@Override
+public void close() throws IOException {
+if (child.getSpan() != null) {
+child.getSpan().stop();
+}
+delegate.close();
 }
-delegate.close();
+};
+success = true;
+return scanner;
+} finally {
+if (!success && child.getSpan() != null) {
+child.getSpan().stop();
 }
-};
-return scanner;
+} 
 } catch (Throwable t) {
-if (child != null) {
-child.stop();
-}
 
ServerUtil.throwIOException(c.getEnvironment().getRegion().getRegionNameAsString(),
 t);
 return null; // impossible
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c3bf33b5/phoenix-core/src/main/java/org/apache/phoenix/trace/util/Tracing.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/trace/util/Tracing.java 
b/phoenix-core/src/main/java/org/apache/phoenix/trace/util/Tracing.java
index 5913cfb..9b0079f 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/trace/util/Tracing.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/trace/u

Apache-Phoenix | Master | Hadoop1 | Build Successful

2014-08-07 Thread Apache Jenkins Server 
Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-master-hadoop1/lastSuccessfulBuild/artifact/

Last Complete Test Report https://builds.apache.org/job/Phoenix-master-hadoop1/lastCompletedBuild/testReport/

Changes
[jtaylor] PHOENIX-1151 Remove unnecessary tracing code