You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2018/08/18 07:40:54 UTC
[1/3] asterixdb git commit: [NO ISSUE][NET] Log Channel Info When
Buffers Are Exceeded
Repository: asterixdb
Updated Branches:
refs/heads/master a4686a9f5 -> d598a2233
[NO ISSUE][NET] Log Channel Info When Buffers Are Exceeded
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- When the read buffers of a network channel are
exceeded, log the channel information and throw
an illegal state exception.
Change-Id: I5290947f57c91d4a537330eef91cf23d9352f24c
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2917
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Reviewed-by: Michael Blow <mb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/851e9e5c
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/851e9e5c
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/851e9e5c
Branch: refs/heads/master
Commit: 851e9e5cf1eb81ba8a3b268b67180d26e95e03ec
Parents: 42a739a
Author: Murtadha Hubail <mh...@apache.org>
Authored: Thu Aug 16 12:07:51 2018 -0700
Committer: Murtadha Hubail <mh...@apache.org>
Committed: Thu Aug 16 14:45:52 2018 -0700
----------------------------------------------------------------------
.../protocols/muxdemux/FullFrameChannelReadInterface.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/851e9e5c/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelReadInterface.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelReadInterface.java b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelReadInterface.java
index 432382a..049cfd8 100644
--- a/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelReadInterface.java
+++ b/hyracks-fullstack/hyracks/hyracks-net/src/main/java/org/apache/hyracks/net/protocols/muxdemux/FullFrameChannelReadInterface.java
@@ -27,9 +27,12 @@ import java.util.Deque;
import org.apache.hyracks.api.comm.IBufferFactory;
import org.apache.hyracks.api.comm.IChannelControlBlock;
import org.apache.hyracks.api.exceptions.NetException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class FullFrameChannelReadInterface extends AbstractChannelReadInterface {
+ private static final Logger LOGGER = LogManager.getLogger();
private final Deque<ByteBuffer> riEmptyStack;
private final IChannelControlBlock ccb;
@@ -64,6 +67,12 @@ public class FullFrameChannelReadInterface extends AbstractChannelReadInterface
currentReadBuffer = bufferFactory.createBuffer();
}
}
+ if (currentReadBuffer == null) {
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("{} read buffers exceeded. Current empty buffers: {}", ccb, riEmptyStack.size());
+ }
+ throw new IllegalStateException(ccb + " read buffers exceeded");
+ }
int rSize = Math.min(size, currentReadBuffer.remaining());
if (rSize > 0) {
currentReadBuffer.limit(currentReadBuffer.position() + rSize);
[3/3] asterixdb git commit: Merge commit
'167518f535616bea71d4d54a679c1db1590c48ca' from stabilization-f69489
Posted by mb...@apache.org.
Merge commit '167518f535616bea71d4d54a679c1db1590c48ca' from stabilization-f69489
Change-Id: I13ccae1109d1626db67d0bbf0898f4c745fa3238
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/d598a223
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/d598a223
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/d598a223
Branch: refs/heads/master
Commit: d598a22333af095202addce29f628309d3fe0b88
Parents: a4686a9 167518f
Author: Michael Blow <mb...@apache.org>
Authored: Sat Aug 18 00:37:56 2018 -0700
Committer: Michael Blow <mb...@apache.org>
Committed: Sat Aug 18 00:37:56 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/hyracks/maven/license/LicenseMojo.java | 7 +++++--
.../protocols/muxdemux/FullFrameChannelReadInterface.java | 9 +++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] asterixdb git commit: [NO ISSUE][LIC] Fix override of both
LICENSE and NOTICE for a single GAV
Posted by mb...@apache.org.
[NO ISSUE][LIC] Fix override of both LICENSE and NOTICE for a single GAV
Change-Id: If1ceb510c7de8abdf46690a85368409f99907325
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2918
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/167518f5
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/167518f5
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/167518f5
Branch: refs/heads/master
Commit: 167518f535616bea71d4d54a679c1db1590c48ca
Parents: 851e9e5
Author: Michael Blow <mb...@apache.org>
Authored: Thu Aug 16 14:26:52 2018 -0700
Committer: Michael Blow <mb...@apache.org>
Committed: Thu Aug 16 16:55:04 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/hyracks/maven/license/LicenseMojo.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/167518f5/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java
index 05ac62b..e72404c 100644
--- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java
+++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java
@@ -364,13 +364,16 @@ public abstract class LicenseMojo extends AbstractMojo {
MavenProject dep = dependencyGavMap.get(gav);
if (dep == null) {
getLog().warn("Unused override dependency " + gav + "; ignoring...");
- } else if (override.getUrl() != null) {
+ continue;
+ }
+ if (override.getUrl() != null) {
final List<Pair<String, String>> newLicense =
Collections.singletonList(new ImmutablePair<>(override.getUrl(), override.getName()));
List<Pair<String, String>> prevLicense = dependencyLicenseMap.put(dep, newLicense);
warnUnlessFlag(dep, IGNORE_LICENSE_OVERRIDE, "license list for " + toGav(dep)
+ " changed with <override>; was: " + prevLicense + ", now: " + newLicense);
- } else if (override.getNoticeUrl() != null) {
+ }
+ if (override.getNoticeUrl() != null) {
noticeOverrides.put(gav, override.getNoticeUrl());
warnUnlessFlag(dep, IGNORE_NOTICE_OVERRIDE,
"notice for " + toGav(dep) + " changed with <override>; now: " + override.getNoticeUrl());