Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: remove excessive StreamWriter info logging #1359

Merged
merged 11 commits into from Oct 18, 2021
Merged

fix: remove excessive StreamWriter info logging #1359

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2990214
fix: update code comment to reflect max size change
yirutang Sep 3, 2021
25da6ed
Merge remote-tracking branch 'upstream/master'
yirutang Sep 8, 2021
8e1ddb9
Merge remote-tracking branch 'upstream/master'
yirutang Sep 9, 2021
fa9710b
Merge remote-tracking branch 'upstream/master'
yirutang Sep 23, 2021
7164815
Merge branch 'googleapis:main' into master
yirutang Sep 30, 2021
fcfd1ca
Merge remote-tracking branch 'upstream/main'
yirutang Oct 1, 2021
aef5a59
Merge remote-tracking branch 'upstream/main'
yirutang Oct 8, 2021
c9dfc94
fix: fix verbose info logs in StreamWriter
yirutang Oct 13, 2021
7bcf5c5
🦉 Updates from OwlBot
gcf-owl-bot[bot] Oct 18, 2021
ebf4626
🦉 Updates from OwlBot
gcf-owl-bot[bot] Oct 18, 2021
246767b
Merge branch 'msg' of https://github.com/yirutang/java-bigquerystorag…
gcf-owl-bot[bot] Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions ...loud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/StreamWriter.java
View file
Open in desktop
Expand Up @@ -307,7 +307,7 @@ public void close() {
} finally {
this.lock.unlock();
}
log.info("Waiting for append thread to finish. Stream: " + streamName);
log.fine("Waiting for append thread to finish. Stream: " + streamName);
try {
appendThread.join();
log.info("User close complete. Stream: " + streamName);
Expand Down Expand Up @@ -366,17 +366,17 @@ private void appendLoop() {
}
}

log.info("Cleanup starts. Stream: " + streamName);
log.fine("Cleanup starts. Stream: " + streamName);
// At this point, the waiting queue is drained, so no more requests.
// We can close the stream connection and handle the remaining inflight requests.
this.streamConnection.close();
waitForDoneCallback();

// At this point, there cannot be more callback. It is safe to clean up all inflight requests.
log.info(
log.fine(
"Stream connection is fully closed. Cleaning up inflight requests. Stream: " + streamName);
cleanupInflightRequests();
log.info("Append thread is done. Stream: " + streamName);
log.fine("Append thread is done. Stream: " + streamName);
}

/*
Expand All @@ -396,7 +396,7 @@ private boolean waitingQueueDrained() {
}

private void waitForDoneCallback() {
log.info("Waiting for done callback from stream connection. Stream: " + streamName);
log.fine("Waiting for done callback from stream connection. Stream: " + streamName);
while (true) {
this.lock.lock();
try {
Expand Down Expand Up @@ -441,7 +441,7 @@ private void cleanupInflightRequests() {
} finally {
this.lock.unlock();
}
log.info(
log.fine(
"Cleaning "
+ localQueue.size()
+ " inflight requests with error: "
Expand Down Expand Up @@ -471,7 +471,7 @@ private void requestCallback(AppendRowsResponse response) {
}

private void doneCallback(Throwable finalStatus) {
log.info(
log.fine(
"Received done callback. Stream: "
+ streamName
+ " Final status: "
Expand Down
14 changes: 7 additions & 7 deletions ...gquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1beta2/StreamWriterV2.java
View file
Open in desktop
Expand Up @@ -307,7 +307,7 @@ public void close() {
} finally {
this.lock.unlock();
}
log.info("Waiting for append thread to finish. Stream: " + streamName);
log.fine("Waiting for append thread to finish. Stream: " + streamName);
try {
appendThread.join();
log.info("User close complete. Stream: " + streamName);
Expand Down Expand Up @@ -366,17 +366,17 @@ private void appendLoop() {
}
}

log.info("Cleanup starts. Stream: " + streamName);
log.fine("Cleanup starts. Stream: " + streamName);
// At this point, the waiting queue is drained, so no more requests.
// We can close the stream connection and handle the remaining inflight requests.
this.streamConnection.close();
waitForDoneCallback();

// At this point, there cannot be more callback. It is safe to clean up all inflight requests.
log.info(
log.fine(
"Stream connection is fully closed. Cleaning up inflight requests. Stream: " + streamName);
cleanupInflightRequests();
log.info("Append thread is done. Stream: " + streamName);
log.fine("Append thread is done. Stream: " + streamName);
}

/*
Expand All @@ -396,7 +396,7 @@ private boolean waitingQueueDrained() {
}

private void waitForDoneCallback() {
log.info("Waiting for done callback from stream connection. Stream: " + streamName);
log.fine("Waiting for done callback from stream connection. Stream: " + streamName);
while (true) {
this.lock.lock();
try {
Expand Down Expand Up @@ -441,7 +441,7 @@ private void cleanupInflightRequests() {
} finally {
this.lock.unlock();
}
log.info(
log.fine(
"Cleaning "
+ localQueue.size()
+ " inflight requests with error: "
Expand Down Expand Up @@ -471,7 +471,7 @@ private void requestCallback(AppendRowsResponse response) {
}

private void doneCallback(Throwable finalStatus) {
log.info(
log.fine(
"Received done callback. Stream: "
+ streamName
+ " Final status: "
Expand Down