You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ht...@apache.org on 2022/09/16 05:04:03 UTC
[asterixdb] branch master updated (b1b23196be -> 269aa08a2c)
This is an automated email from the ASF dual-hosted git repository.
htowaileb pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
from b1b23196be [ASTERIXDB-3075][COMP] Fix ExtractCommonOperatorsRule producing invalid plan
new c8233ab68d Update Hadoop to 3.3.4 and Parquet to 1.12.3
new c77174917b [ASTERIXDB-3072] Make HDFS scheduler to use different type of channels
new 8bc2f61b7c [NO ISSUE][CLUS] Clean Up Failed Nodes List
new 4179960feb Merge branch gerrit/neo
new 269aa08a2c Merge "Merge branch gerrit/neo"
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/asterix/external/util/HDFSUtils.java | 5 ++-
.../asterix/runtime/utils/ClusterStateManager.java | 1 +
asterixdb/asterix-server/pom.xml | 17 ++++-----
asterixdb/pom.xml | 4 +--
.../appended-resources/supplemental-models.xml | 32 +++++++++++------
...ontent.com_luben_zstd-jni_v1.5.0-1_LICENSE.txt} | 0
...rcontent.com_qos-ch_slf4j_v_1.7.36_LICENSE.txt} | 2 +-
.../apache/hyracks/hdfs/scheduler/Scheduler.java | 42 ++++++++++------------
.../apache/hyracks/hdfs2/scheduler/Scheduler.java | 17 ++++-----
9 files changed, 61 insertions(+), 59 deletions(-)
rename asterixdb/src/main/licenses/content/{raw.githubusercontent.com_luben_zstd-jni_v1.4.9-1_LICENSE.txt => raw.githubusercontent.com_luben_zstd-jni_v1.5.0-1_LICENSE.txt} (100%)
copy asterixdb/src/main/licenses/content/{raw.githubusercontent.com_qos-ch_slf4j_v_1.7.25_slf4j-api_LICENSE.txt => raw.githubusercontent.com_qos-ch_slf4j_v_1.7.36_LICENSE.txt} (95%)
[asterixdb] 02/05: [ASTERIXDB-3072] Make HDFS scheduler to use different type of channels
Posted by ht...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
htowaileb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit c77174917bc8de3b3a0d050d06ec1b06ce39bf0f
Author: Wail Alkowaileet <wa...@gmail.com>
AuthorDate: Thu Sep 1 13:32:19 2022 -0700
[ASTERIXDB-3072] Make HDFS scheduler to use different type of channels
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
HDFS scheduler only uses plain connection. This change allows it
to use different type of connections
Change-Id: I64f9f4a30a6564aac26e99433ccc695975a22a3b
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17224
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Wail Alkowaileet <wa...@gmail.com>
Reviewed-by: Murtadha Hubail <mh...@apache.org>
---
.../apache/asterix/external/util/HDFSUtils.java | 5 ++-
.../apache/hyracks/hdfs/scheduler/Scheduler.java | 42 ++++++++++------------
.../apache/hyracks/hdfs2/scheduler/Scheduler.java | 17 ++++-----
3 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/HDFSUtils.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/HDFSUtils.java
index 9e49d86612..3506216e10 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/HDFSUtils.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/HDFSUtils.java
@@ -62,6 +62,7 @@ import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.api.exceptions.IWarningCollector;
import org.apache.hyracks.api.exceptions.Warning;
+import org.apache.hyracks.api.network.INetworkSecurityManager;
import org.apache.hyracks.hdfs.scheduler.Scheduler;
import org.apache.parquet.hadoop.ParquetInputFormat;
@@ -72,10 +73,12 @@ public class HDFSUtils {
public static Scheduler initializeHDFSScheduler(ICCServiceContext serviceCtx) throws HyracksDataException {
ICCContext ccContext = serviceCtx.getCCContext();
+ INetworkSecurityManager networkSecurityManager = serviceCtx.getControllerService().getNetworkSecurityManager();
Scheduler scheduler = null;
try {
scheduler = new Scheduler(ccContext.getClusterControllerInfo().getClientNetAddress(),
- ccContext.getClusterControllerInfo().getClientNetPort());
+ ccContext.getClusterControllerInfo().getClientNetPort(),
+ networkSecurityManager.getSocketChannelFactory());
} catch (HyracksException e) {
throw new RuntimeDataException(ErrorCode.UTIL_HDFS_UTILS_CANNOT_OBTAIN_HDFS_SCHEDULER);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java b/hyracks-fullstack/hyracks/hyracks-hdfs/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java
index b9d68f7bf3..f5bf07b6b0 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java
@@ -37,6 +37,7 @@ import org.apache.hyracks.api.client.IHyracksClientConnection;
import org.apache.hyracks.api.client.NodeControllerInfo;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.exceptions.HyracksException;
+import org.apache.hyracks.api.network.ISocketChannelFactory;
import org.apache.hyracks.api.topology.ClusterTopology;
import org.apache.hyracks.hdfs.api.INcCollection;
import org.apache.hyracks.hdfs.api.INcCollectionBuilder;
@@ -56,16 +57,24 @@ public class Scheduler {
private static final Logger LOGGER = LogManager.getLogger();
- /** a list of NCs */
+ /**
+ * a list of NCs
+ */
private String[] NCs;
- /** a map from ip to NCs */
+ /**
+ * a map from ip to NCs
+ */
private Map<String, List<String>> ipToNcMapping = new HashMap<>();
- /** a map from the NC name to the index */
+ /**
+ * a map from the NC name to the index
+ */
private Map<String, Integer> ncNameToIndex = new HashMap<>();
- /** a map from NC name to the NodeControllerInfo */
+ /**
+ * a map from NC name to the NodeControllerInfo
+ */
private Map<String, NodeControllerInfo> ncNameToNcInfos;
/**
@@ -76,13 +85,15 @@ public class Scheduler {
/**
* The constructor of the scheduler.
*
- * @param ncNameToNcInfos
+ * @param ipAddress IP address
+ * @param port Port
+ * @param channelFactory Channel Factory
* @throws HyracksException
*/
- public Scheduler(String ipAddress, int port) throws HyracksException {
+ public Scheduler(String ipAddress, int port, ISocketChannelFactory channelFactory) throws HyracksException {
try {
- IHyracksClientConnection hcc = new HyracksConnection(ipAddress, port);
+ IHyracksClientConnection hcc = new HyracksConnection(ipAddress, port, channelFactory);
this.ncNameToNcInfos = hcc.getNodeControllerInfos();
ClusterTopology topology = hcc.getClusterTopology();
this.ncCollectionBuilder = topology == null ? new IPProximityNcCollectionBuilder()
@@ -93,23 +104,6 @@ public class Scheduler {
}
}
- /**
- * The constructor of the scheduler.
- *
- * @param ncNameToNcInfos
- * @throws HyracksException
- */
- public Scheduler(String ipAddress, int port, INcCollectionBuilder ncCollectionBuilder) throws HyracksException {
- try {
- IHyracksClientConnection hcc = new HyracksConnection(ipAddress, port);
- this.ncNameToNcInfos = hcc.getNodeControllerInfos();
- this.ncCollectionBuilder = ncCollectionBuilder;
- loadIPAddressToNCMap(ncNameToNcInfos);
- } catch (Exception e) {
- throw HyracksException.create(e);
- }
- }
-
/**
* The constructor of the scheduler.
*
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/src/main/java/org/apache/hyracks/hdfs2/scheduler/Scheduler.java b/hyracks-fullstack/hyracks/hyracks-hdfs/src/main/java/org/apache/hyracks/hdfs2/scheduler/Scheduler.java
index ddf140f034..a26a5f7261 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/src/main/java/org/apache/hyracks/hdfs2/scheduler/Scheduler.java
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/src/main/java/org/apache/hyracks/hdfs2/scheduler/Scheduler.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.mapreduce.InputSplit;
import org.apache.hyracks.api.client.NodeControllerInfo;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.exceptions.HyracksException;
+import org.apache.hyracks.api.network.ISocketChannelFactory;
import org.apache.hyracks.api.topology.ClusterTopology;
import org.apache.hyracks.hdfs.api.INcCollectionBuilder;
@@ -44,15 +45,14 @@ public class Scheduler {
* @param ncNameToNcInfos
* @throws HyracksException
*/
- public Scheduler(String ipAddress, int port) throws HyracksException {
- scheduler = new org.apache.hyracks.hdfs.scheduler.Scheduler(ipAddress, port);
+ public Scheduler(String ipAddress, int port, ISocketChannelFactory channelFactory) throws HyracksException {
+ scheduler = new org.apache.hyracks.hdfs.scheduler.Scheduler(ipAddress, port, channelFactory);
}
/**
* The constructor of the scheduler.
*
- * @param ncNameToNcInfos
- * the mapping from nc names to nc infos
+ * @param ncNameToNcInfos the mapping from nc names to nc infos
* @throws HyracksException
*/
public Scheduler(Map<String, NodeControllerInfo> ncNameToNcInfos) throws HyracksException {
@@ -62,10 +62,8 @@ public class Scheduler {
/**
* The constructor of the scheduler.
*
- * @param ncNameToNcInfos
- * the mapping from nc names to nc infos
- * @param topology
- * the hyracks cluster toplogy
+ * @param ncNameToNcInfos the mapping from nc names to nc infos
+ * @param topology the hyracks cluster toplogy
* @throws HyracksException
*/
public Scheduler(Map<String, NodeControllerInfo> ncNameToNcInfos, ClusterTopology topology)
@@ -76,8 +74,7 @@ public class Scheduler {
/**
* The constructor of the scheduler.
*
- * @param ncNameToNcInfos
- * the mapping from nc names to nc infos
+ * @param ncNameToNcInfos the mapping from nc names to nc infos
* @throws HyracksException
*/
public Scheduler(Map<String, NodeControllerInfo> ncNameToNcInfos, INcCollectionBuilder builder)
[asterixdb] 04/05: Merge branch gerrit/neo
Posted by ht...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
htowaileb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 4179960feb25163df5d099910b6121eb5e80e164
Merge: 59ad708614 8bc2f61b7c
Author: Hussain Towaileb <Hu...@Couchbase.com>
AuthorDate: Thu Sep 15 19:45:51 2022 +0300
Merge branch gerrit/neo
Change-Id: I728dac1af801e158e064001468776bab601918e7
.../apache/asterix/external/util/HDFSUtils.java | 5 ++-
.../asterix/runtime/utils/ClusterStateManager.java | 1 +
asterixdb/asterix-server/pom.xml | 17 ++++-----
asterixdb/pom.xml | 4 +--
.../appended-resources/supplemental-models.xml | 32 +++++++++++------
...ontent.com_luben_zstd-jni_v1.5.0-1_LICENSE.txt} | 0
...ercontent.com_qos-ch_slf4j_v_1.7.36_LICENSE.txt | 21 +++++++++++
.../apache/hyracks/hdfs/scheduler/Scheduler.java | 42 ++++++++++------------
.../apache/hyracks/hdfs2/scheduler/Scheduler.java | 17 ++++-----
9 files changed, 81 insertions(+), 58 deletions(-)
diff --cc asterixdb/asterix-server/pom.xml
index e1d09640ba,16edbb8294..c82384df41
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@@ -450,71 -415,13 +450,75 @@@
<noticeUrl>https://raw.githubusercontent.com/msgpack/msgpack-java/0.8.20/NOTICE</noticeUrl>
</override>
<override>
- <gav>com.github.luben:zstd-jni:1.4.9-1</gav>
- <url>https://raw.githubusercontent.com/luben/zstd-jni/v1.4.9-1/LICENSE</url>
+ <gav>com.github.luben:zstd-jni:1.5.0-1</gav>
+ <url>https://raw.githubusercontent.com/luben/zstd-jni/v1.5.0-1/LICENSE</url>
+ </override>
+ <override>
+ <gav>org.slf4j:slf4j-reload4j:1.7.36</gav>
+ <url>https://raw.githubusercontent.com/qos-ch/slf4j/v_1.7.36/LICENSE.txt</url>
</override>
+ <override>
+ <gavs>
+ <gav>com.google.cloud.bigdataoss:gcs-connector:hadoop3-2.2.6</gav>
+ <gav>com.google.cloud.bigdataoss:gcsio:2.2.6</gav>
+ <gav>com.google.cloud.bigdataoss:util-hadoop:hadoop3-2.2.6</gav>
+ <gav>com.google.cloud.bigdataoss:util:2.2.6</gav>
+ </gavs>
+ <url>https://raw.githubusercontent.com/GoogleCloudDataproc/hadoop-connectors/v2.2.6/LICENSE</url>
+ </override>
+ <override>
+ <gavs>
+ <gav>com.google.flogger:flogger:0.7.1</gav>
+ <gav>com.google.flogger:google-extensions:0.7.1</gav>
+ <gav>com.google.flogger:flogger-system-backend:0.7.1</gav>
+ </gavs>
+ <url>https://raw.githubusercontent.com/google/flogger/flogger-0.7.1/LICENSE</url>
+ </override>
+ <override>
+ <gavs>
+ <gav>com.google.api.grpc:proto-google-cloud-monitoring-v3:1.64.0</gav>
+ <gav>com.google.api.grpc:proto-google-cloud-storage-v2:2.2.2-alpha</gav>
+ <gav>com.google.api.grpc:grpc-google-cloud-storage-v2:2.2.2-alpha</gav>
+ </gavs>
+ <url>https://raw.githubusercontent.com/googleapis/googleapis/master/LICENSE</url>
+ </override>
+ <override>
+ <gav>com.lmax:disruptor:3.4.2</gav>
+ <url>https://raw.githubusercontent.com/LMAX-Exchange/disruptor/3.4.2/LICENCE.txt</url>
+ </override>
+ <override>
+ <gav>com.google.cloud:google-cloud-core-grpc:1.82.0</gav>
+ <url>https://raw.githubusercontent.com/googleapis/java-core/v1.82.0/LICENSE</url>
+ </override>
+ <override>
+ <gav>com.google.cloud:google-cloud-monitoring:1.82.0</gav>
+ <url>https://raw.githubusercontent.com/googleapis/java-monitoring/1.82.0/LICENSE</url>
+ </override>
+ <override>
+ <gav>com.google.api-client:google-api-client-jackson2:1.32.2</gav>
+ <url>https://raw.githubusercontent.com/googleapis/google-api-java-client/v1.32.2/LICENSE</url>
+ </override>
+ <override>
+ <gav>org.conscrypt:conscrypt-openjdk-uber:2.5.1</gav>
+ <url>https://raw.githubusercontent.com/google/conscrypt/2.5.1/LICENSE</url>
+ <noticeUrl>https://raw.githubusercontent.com/google/conscrypt/2.5.1/NOTICE</noticeUrl>
+ </override>
+ <override>
+ <gav>io.perfmark:perfmark-api:0.23.0</gav>
+ <url>https://raw.githubusercontent.com/perfmark/perfmark/v0.23.0/LICENSE</url>
+ <noticeUrl>https://raw.githubusercontent.com/perfmark/perfmark/v0.23.0/NOTICE</noticeUrl>
+ </override>
+ <override>
+ <gav>com.google.api:gax-grpc:2.7.1</gav>
+ <url>https://raw.githubusercontent.com/googleapis/gax-java/v2.7.1/LICENSE</url>
+ </override>
+ <override>
+ <gavs>
+ <gav>org.bouncycastle:bcprov-jdk15on:1.60</gav>
+ <gav>org.bouncycastle:bcpkix-jdk15on:1.60</gav>
+ </gavs>
+ <url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
+ </override>
</overrides>
<licenses>
<license>
[asterixdb] 05/05: Merge "Merge branch gerrit/neo"
Posted by ht...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
htowaileb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 269aa08a2cb903c7103f7a97a97bd13da24a056d
Merge: b1b23196be 4179960feb
Author: Apache AsterixDB Gerrit <de...@asterixdb.apache.org>
AuthorDate: Fri Sep 16 04:46:56 2022 +0000
Merge "Merge branch gerrit/neo"
.../apache/asterix/external/util/HDFSUtils.java | 5 ++-
.../asterix/runtime/utils/ClusterStateManager.java | 1 +
asterixdb/asterix-server/pom.xml | 17 ++++-----
asterixdb/pom.xml | 4 +--
.../appended-resources/supplemental-models.xml | 32 +++++++++++------
...ontent.com_luben_zstd-jni_v1.5.0-1_LICENSE.txt} | 0
...ercontent.com_qos-ch_slf4j_v_1.7.36_LICENSE.txt | 21 +++++++++++
.../apache/hyracks/hdfs/scheduler/Scheduler.java | 42 ++++++++++------------
.../apache/hyracks/hdfs2/scheduler/Scheduler.java | 17 ++++-----
9 files changed, 81 insertions(+), 58 deletions(-)
[asterixdb] 01/05: Update Hadoop to 3.3.4 and Parquet to 1.12.3
Posted by ht...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
htowaileb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit c8233ab68d3fa0f4c34fac10f80b0c8981aa3185
Author: Hussain Towaileb <Hu...@Couchbase.com>
AuthorDate: Sat Aug 27 02:17:18 2022 +0300
Update Hadoop to 3.3.4 and Parquet to 1.12.3
Change-Id: Ib78172183426934009021eeb377bfa9876f88a9a
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17203
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Hussain Towaileb <hu...@gmail.com>
Reviewed-by: Michael Blow <mb...@apache.org>
Tested-by: Hussain Towaileb <hu...@gmail.com>
---
asterixdb/asterix-server/pom.xml | 17 ++++--------
asterixdb/pom.xml | 4 +--
.../appended-resources/supplemental-models.xml | 32 +++++++++++++++-------
...ontent.com_luben_zstd-jni_v1.5.0-1_LICENSE.txt} | 0
...ercontent.com_qos-ch_slf4j_v_1.7.36_LICENSE.txt | 21 ++++++++++++++
5 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 53a773ee03..16edbb8294 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -415,8 +415,12 @@
<noticeUrl>https://raw.githubusercontent.com/msgpack/msgpack-java/0.8.20/NOTICE</noticeUrl>
</override>
<override>
- <gav>com.github.luben:zstd-jni:1.4.9-1</gav>
- <url>https://raw.githubusercontent.com/luben/zstd-jni/v1.4.9-1/LICENSE</url>
+ <gav>com.github.luben:zstd-jni:1.5.0-1</gav>
+ <url>https://raw.githubusercontent.com/luben/zstd-jni/v1.5.0-1/LICENSE</url>
+ </override>
+ <override>
+ <gav>org.slf4j:slf4j-reload4j:1.7.36</gav>
+ <url>https://raw.githubusercontent.com/qos-ch/slf4j/v_1.7.36/LICENSE.txt</url>
</override>
</overrides>
<licenses>
@@ -543,15 +547,6 @@
<aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/legalcode</aliasUrls>
<aliasUrls>http://creativecommons.org/publicdomain/zero/1.0/</aliasUrls>
</license>
- <license>
- <displayName>The 2-Clause BSD License</displayName>
- <url>https://opensource.org/licenses/BSD-2-Clause</url>
- <contentFile>raw.githubusercontent.com_luben_zstd-jni_v1.4.9-1_LICENSE.txt</contentFile>
- <aliasUrls>
- <aliasURL>https://opensource.org/licenses/bsd-license.php</aliasURL>
- <aliasUrl>https://raw.githubusercontent.com/luben/zstd-jni/v1.4.9-1/LICENSE</aliasUrl>
- </aliasUrls>
- </license>
<license>
<displayName>The Go license</displayName>
<url>http://golang.org/LICENSE</url>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index cd90712d5a..d48eb8a6a5 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -84,11 +84,11 @@
<!-- Versions under dependencymanagement or used in many projects via properties -->
<algebricks.version>0.3.8-SNAPSHOT</algebricks.version>
<hyracks.version>0.3.8-SNAPSHOT</hyracks.version>
- <hadoop.version>3.3.2</hadoop.version>
+ <hadoop.version>3.3.4</hadoop.version>
<jacoco.version>0.7.6.201602180812</jacoco.version>
<log4j.version>2.17.1</log4j.version>
<awsjavasdk.version>2.17.218</awsjavasdk.version>
- <parquet.version>1.12.0</parquet.version>
+ <parquet.version>1.12.3</parquet.version>
<hadoop-awsjavasdk.version>1.12.109</hadoop-awsjavasdk.version>
<azureblobjavasdk.version>12.14.2</azureblobjavasdk.version>
<azuredatalakejavasdk.version>12.7.2</azuredatalakejavasdk.version>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml
index cc1749b3ce..8af8ec1592 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -1652,9 +1652,21 @@
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.4.9-1</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.4.9-1</license.ignoreMissingEmbeddedNotice>
- <license.ignoreLicenseOverride>1.4.9-1</license.ignoreLicenseOverride>
+ <license.ignoreMissingEmbeddedLicense>1.5.0-1</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.5.0-1</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.5.0-1</license.ignoreLicenseOverride>
+ </properties>
+ </project>
+ </supplement>
+
+ <supplement>
+ <project>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ <properties>
+ <license.ignoreMissingEmbeddedLicense>1.7.36</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.7.36</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreLicenseOverride>1.7.36</license.ignoreLicenseOverride>
</properties>
</project>
</supplement>
@@ -1664,8 +1676,8 @@
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-format-structures</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.12.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.12.3</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.12.3</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1675,8 +1687,8 @@
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-common</artifactId>
<properties>
- <license.ignoreMissingEmbeddedLicense>1.12.0</license.ignoreMissingEmbeddedLicense>
- <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedLicense>1.12.3</license.ignoreMissingEmbeddedLicense>
+ <license.ignoreMissingEmbeddedNotice>1.12.3</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1687,7 +1699,7 @@
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-column</artifactId>
<properties>
- <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedNotice>1.12.3</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1698,7 +1710,7 @@
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-encoding</artifactId>
<properties>
- <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedNotice>1.12.3</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
@@ -1709,7 +1721,7 @@
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-hadoop</artifactId>
<properties>
- <license.ignoreMissingEmbeddedNotice>1.12.0</license.ignoreMissingEmbeddedNotice>
+ <license.ignoreMissingEmbeddedNotice>1.12.3</license.ignoreMissingEmbeddedNotice>
</properties>
</project>
</supplement>
diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_luben_zstd-jni_v1.4.9-1_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_luben_zstd-jni_v1.5.0-1_LICENSE.txt
similarity index 100%
rename from asterixdb/src/main/licenses/content/raw.githubusercontent.com_luben_zstd-jni_v1.4.9-1_LICENSE.txt
rename to asterixdb/src/main/licenses/content/raw.githubusercontent.com_luben_zstd-jni_v1.5.0-1_LICENSE.txt
diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_qos-ch_slf4j_v_1.7.36_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_qos-ch_slf4j_v_1.7.36_LICENSE.txt
new file mode 100644
index 0000000000..f687729a0b
--- /dev/null
+++ b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_qos-ch_slf4j_v_1.7.36_LICENSE.txt
@@ -0,0 +1,21 @@
+Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
[asterixdb] 03/05: [NO ISSUE][CLUS] Clean Up Failed Nodes List
Posted by ht...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
htowaileb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 8bc2f61b7c55b175e58f4577e824b946b2baa2f8
Author: Murtadha Hubail <mu...@couchbase.com>
AuthorDate: Wed Sep 14 03:38:21 2022 +0300
[NO ISSUE][CLUS] Clean Up Failed Nodes List
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- When a node is removed, ensure it is removed from the
failed nodes list.
Change-Id: I278164f8bf9190804d31a6d92a9e78230a3b463c
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17226
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Murtadha Hubail <mh...@apache.org>
Reviewed-by: Ali Alsuliman <al...@gmail.com>
---
.../main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
index 052f568cc3..d3c87ff341 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
@@ -420,6 +420,7 @@ public class ClusterStateManager implements IClusterStateManager {
clusterPartitions.remove(nodePartition.getPartitionId());
}
participantNodes.remove(nodeId);
+ failedNodes.remove(nodeId);
}
}