Skip to content

Commit

Permalink
Merge branch 'main' of ssh://github.com/risingwavelabs/risingwave int…
Browse files Browse the repository at this point in the history
…o acosd
  • Loading branch information
CAJan93 committed Jun 27, 2024
2 parents a271c3c + 18f9980 commit 5497f2a
Show file tree
Hide file tree
Showing 14 changed files with 401 additions and 61 deletions.
2 changes: 1 addition & 1 deletion docker/dashboards/risingwave-dev-dashboard.json

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions grafana/risingwave-dev-dashboard.dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,17 @@ def section_cluster_node(outer_panels):
),
],
),
panels.timeseries_cpu(
"Node CPU relative",
"CPU usage relative to k8s resource limit of container",
[
panels.target(
"(sum(rate(container_cpu_usage_seconds_total{namespace=~\"$namespace\",container=~\"$component\",pod=~\"$pod\"}[$__rate_interval])) by (namespace, pod)) / (sum(kube_pod_container_resource_limits{namespace=~\"$namespace\",pod=~\"$pod\",container=~\"$component\", resource=\"cpu\"}) by (namespace, pod))",
"cpu usage @ {{%s}} @ {{%s}}"
% (COMPONENT_LABEL, NODE_LABEL),
),
],
),
panels.timeseries_count(
"Meta Cluster",
"RW cluster can configure multiple meta nodes to achieve high availability. One is the leader and the "
Expand Down
2 changes: 1 addition & 1 deletion grafana/risingwave-dev-dashboard.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions java/connector-node/risingwave-sink-iceberg/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@
<groupId>software.amazon.awssdk</groupId>
<artifactId>sts</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>glue</artifactId>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Copyright 2024 RisingWave Labs
*
* Licensed 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 com.risingwave.connector.catalog;

import java.util.Map;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.AwsCredentials;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.utils.Validate;

/** This class is used to provide a credential to glue catalog */
public class GlueCredentialProvider implements AwsCredentialsProvider {
private final AwsCredentials credentials;

private GlueCredentialProvider(AwsCredentials credentials) {
this.credentials =
(AwsCredentials)
Validate.notNull(
credentials, "Credentials must not be null.", new Object[0]);
}

public static GlueCredentialProvider create(Map<String, String> config) {
return new GlueCredentialProvider(
AwsBasicCredentials.create(
config.get("glue.access-key-id"), config.get("glue.secret-access-key")));
}

public AwsCredentials resolveCredentials() {
return this.credentials;
}
}
5 changes: 5 additions & 0 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,11 @@
<artifactId>apache-client</artifactId>
<version>${aws.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>glue</artifactId>
<version>${aws.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/batch/benches/hash_join.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ fn create_hash_join_executor(
cond,
"HashJoinExecutor".into(),
CHUNK_SIZE,
false,
None,
BatchSpillMetrics::for_test(),
ShutdownToken::empty(),
MemoryContext::none(),
Expand Down
Loading

0 comments on commit 5497f2a

Please sign in to comment.