apurtell commented on a change in pull request #4106:
URL: https://github.com/apache/hbase/pull/4106#discussion_r825046474
##########
File path:
hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncClientScanner.java
##########
@@ -173,26 +197,41 @@ private void startScan(OpenScannerResponse resp) {
.pauseForCQTBE(pauseForCQTBENs,
TimeUnit.NANOSECONDS).maxAttempts(maxAttempts)
.startLogErrorsCnt(startLogErrorsCnt).start(resp.controller,
resp.resp),
(hasMore, error) -> {
- if (error != null) {
- consumer.onError(error);
- return;
- }
- if (hasMore) {
- openScanner();
- } else {
- consumer.onComplete();
+ final Span localSpan = span;
+ try (Scope ignored = localSpan.makeCurrent()) {
+ if (error != null) {
+ try {
+ consumer.onError(error);
+ return;
+ } finally {
+ TraceUtil.setError(localSpan, error);
+ localSpan.end();
+ }
+ }
+ if (hasMore) {
+ openScanner();
+ } else {
+ try {
+ consumer.onComplete();
+ } finally {
+ localSpan.setStatus(StatusCode.OK);
+ localSpan.end();
+ }
+ }
}
});
}
private CompletableFuture<OpenScannerResponse> openScanner(int replicaId) {
- return conn.callerFactory.<OpenScannerResponse> single().table(tableName)
-
.row(scan.getStartRow()).replicaId(replicaId).locateType(getLocateType(scan))
- .priority(scan.getPriority())
- .rpcTimeout(rpcTimeoutNs, TimeUnit.NANOSECONDS)
- .operationTimeout(scanTimeoutNs, TimeUnit.NANOSECONDS).pause(pauseNs,
TimeUnit.NANOSECONDS)
- .pauseForCQTBE(pauseForCQTBENs,
TimeUnit.NANOSECONDS).maxAttempts(maxAttempts)
-
.startLogErrorsCnt(startLogErrorsCnt).action(this::callOpenScanner).call();
+ try (Scope ignored = span.makeCurrent()) {
Review comment:
Do you want to also maintain your volatile usage discipline here and
copy 'span' to a 'localSpan' first, as you have done at other call sites?
##########
File path:
hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncTableImpl.java
##########
@@ -232,22 +233,29 @@ public ResultScanner getScanner(Scan scan) {
}
private void scan0(Scan scan, ScanResultConsumer consumer) {
- try (ResultScanner scanner = getScanner(scan)) {
- consumer.onScanMetricsCreated(scanner.getScanMetrics());
- for (Result result; (result = scanner.next()) != null;) {
- if (!consumer.onNext(result)) {
- break;
+ Span span = null;
+ try (AsyncTableResultScanner scanner = rawTable.getScanner(scan)) {
+ span = scanner.getSpan();
Review comment:
Can this be null? I guess not as long as someone is aware of
getter/setter for span in `AsyncTableResultScanner` and the expected
convention. I suppose the resulting NPE would clear enough if not.
##########
File path:
hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableTracing.java
##########
@@ -452,6 +456,53 @@ public void testScanAll() {
assertTrace("SCAN");
}
+ @Test
+ public void testScan() throws Throwable {
Review comment:
Name: testScanTracing?
##########
File path:
hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableTracing.java
##########
@@ -452,6 +456,53 @@ public void testScanAll() {
assertTrace("SCAN");
}
+ @Test
+ public void testScan() throws Throwable {
+ final CountDownLatch doneSignal = new CountDownLatch(1);
+ final AtomicInteger count = new AtomicInteger();
+ final AtomicReference<Throwable> throwable = new AtomicReference<>();
+ final Scan scan = new Scan().setCaching(1).setMaxResultSize(1).setLimit(1);
+ table.scan(scan, new ScanResultConsumer() {
+ @Override public boolean onNext(Result result) {
+ if (result.getRow() != null) {
+ count.incrementAndGet();
+ }
+ return true;
+ }
+
+ @Override public void onError(Throwable error) {
+ throwable.set(error);
+ doneSignal.countDown();
+ }
+
+ @Override public void onComplete() {
+ doneSignal.countDown();
+ }
+ });
+ doneSignal.await();
+ if (throwable.get() != null) {
+ throw throwable.get();
+ }
+ assertThat("user code did not run. check test setup.", count.get(),
greaterThan(0));
+ assertTrace("SCAN");
+ }
+
+ @Test
+ public void testGetScanner() {
Review comment:
Name: testGetScannerTracing?
##########
File path:
hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestAsyncTableScan.java
##########
@@ -17,29 +17,95 @@
*/
package org.apache.hadoop.hbase.client;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.hamcrest.Matchers.isA;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.fail;
+import io.opentelemetry.sdk.trace.data.SpanData;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.Arrays;
import java.util.List;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.ConnectionRule;
import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.MatcherPredicate;
+import org.apache.hadoop.hbase.MiniClusterRule;
+import org.apache.hadoop.hbase.StartTestingClusterOption;
import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.Waiter;
import org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException;
+import org.apache.hadoop.hbase.trace.OpenTelemetryClassRule;
+import org.apache.hadoop.hbase.trace.OpenTelemetryTestRule;
+import org.apache.hadoop.hbase.trace.TraceUtil;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.JVMClusterUtil;
import org.apache.hadoop.hbase.util.Pair;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.hamcrest.Matcher;
+import org.junit.ClassRule;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExternalResource;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestName;
+import org.junit.rules.TestRule;
public abstract class AbstractTestAsyncTableScan {
- protected static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
+ protected static final OpenTelemetryClassRule otelClassRule =
OpenTelemetryClassRule.create();
+ protected static final MiniClusterRule miniClusterRule =
MiniClusterRule.newBuilder()
+ .setMiniClusterOption(StartTestingClusterOption.builder()
+ .numWorkers(3)
+ .build())
+ .build();
+
+ protected static final ConnectionRule connectionRule =
+ new ConnectionRule(miniClusterRule::createConnection);
+
+ private static final class Setup extends ExternalResource {
Review comment:
Initially I was wondering about this but I see it is just a junit
convention refactor
##########
File path:
hbase-client/src/test/java/org/apache/hadoop/hbase/client/trace/StringTraceRenderer.java
##########
@@ -0,0 +1,139 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.client.trace;
+
+import io.opentelemetry.api.trace.SpanId;
+import io.opentelemetry.sdk.trace.data.SpanData;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A Rudimentary tool for visualizing a hierarchy of spans. Given a collection
of spans, indexes
+ * them from parents to children and prints them out one per line, indented.
+ */
Review comment:
This is nice
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
