Skip to content

Commit c1def90

Browse files
jiangpengchengjiangpengcheng
committed
Change field processingGuarantee to processingGuarantees for WindowConfig (#794)
* Change field processingGuarantee to processingGuarantees for WindowConfig * fix ci
1 parent ca2806b commit c1def90

File tree

12 files changed

+21
-7
lines changed

12 files changed

+21
-7
lines changed

‎.ci/helm.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ function ci::install_pulsar_charts() {
9292
helm repo add grafana https://grafana.github.io/helm-charts
9393
helm repo update
9494
yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
95+
# the superset chart seems got some issue, so we remove it
96+
yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
9597
helm dependency update charts/pulsar
9698
${HELM} install sn-platform --set initialize=true --values charts/pulsar/mini_values.yaml charts/pulsar --debug
9799

‎.ci/tests/integration-oauth2/e2e.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ setup:
3939
helm repo add grafana https://grafana.github.io/helm-charts
4040
helm repo update
4141
yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
42+
yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
4243
helm dependency update charts/pulsar
4344
helm install ${PULSAR_RELEASE_NAME} --set initialize=true --values ../.ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml charts/pulsar
4445

‎.ci/tests/integration-oauth2/e2e_with_downloader.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ setup:
3939
helm repo add grafana https://grafana.github.io/helm-charts
4040
helm repo update
4141
yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
42+
yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
4243
helm dependency update charts/pulsar
4344
helm install ${PULSAR_RELEASE_NAME} --set initialize=true --values ../.ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml charts/pulsar
4445

‎.ci/tests/integration/cases/logging-window-function/manifests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
windowConfig:
3737
windowLengthCount: 10
3838
slidingIntervalCount: 5
39-
processingGuarantee: ATLEAST_ONCE
39+
processingGuarantees: ATLEAST_ONCE
4040
# the processingGuarantee should be manual for window function
4141
# see: https://github.com/apache/pulsar/pull/16279/files#diff-c77c024ccb31c94a7aa80cb8e96d7e370709157bdc104a1be7867fb6c7aa0586R318-R319
4242
processingGuarantee: manual

‎.ci/tests/integration/cases/logging-window-function/verify.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,14 @@ if [ $? -ne 0 ]; then
4343
exit 1
4444
fi
4545

46+
# verify the `processingGuarantees` config
47+
verify_pg=$(kubectl logs window-function-sample-function-0 | grep processingGuarantees=ATLEAST_ONCE)
48+
if [ $? -ne 0 ]; then
49+
echo "$verify_pg"
50+
kubectl delete -f "${manifests_file}" > /dev/null 2>&1 || true
51+
exit 1
52+
fi
53+
4654
verify_java_result=$(NAMESPACE=${PULSAR_NAMESPACE} CLUSTER=${PULSAR_RELEASE_NAME} ci::send_test_data "persistent://public/default/window-function-input-topic" "test-message" 3 2>&1)
4755
if [ $? -ne 0 ]; then
4856
echo "$verify_java_result"
@@ -80,7 +88,7 @@ fi
8088
#fi
8189

8290
verify_log_result=$(kubectl logs -l compute.functionmesh.io/name=window-function-sample --tail=-1 | grep -e "-window-log" | wc -l)
83-
if [ $verify_log_result -ne 0 ]; then
91+
if [ $verify_log_result -eq 15 ]; then
8492
sub_name=$(echo $RANDOM | md5sum | head -c 20; echo;)
8593
verify_log_topic_result=$(kubectl exec -n ${PULSAR_NAMESPACE} ${PULSAR_RELEASE_NAME}-pulsar-broker-0 -- bin/pulsar-client consume -n 15 -s $sub_name --subscription-position Earliest "persistent://public/default/window-function-logs" | grep -e "-window-log" | wc -l)
8694
if [ $verify_log_topic_result -ne 0 ]; then

‎.ci/tests/integration/e2e.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ setup:
4545
helm repo add grafana https://grafana.github.io/helm-charts
4646
helm repo update
4747
yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
48+
yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
4849
helm dependency update charts/pulsar
4950
helm install ${PULSAR_RELEASE_NAME} --set initialize=true --values ../.ci/clusters/values_skywalking_e2e_cluster.yaml charts/pulsar
5051

‎.ci/tests/integration/e2e_with_tls.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ setup:
3434
helm repo add grafana https://grafana.github.io/helm-charts
3535
helm repo update
3636
yq -i '.dependencies[0].repository = "https://grafana.github.io/helm-charts"' charts/pulsar/requirements.yaml
37+
yq -i 'del(.dependencies[1])' charts/pulsar/requirements.yaml
3738
helm dependency update charts/pulsar
3839
helm install ${PULSAR_RELEASE_NAME} --set initialize=true --values ../.ci/clusters/values_skywalking_e2e_cluster_with_tls.yaml charts/pulsar
3940

‎api/compute/v1alpha1/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ type WindowConfig struct {
546546
MaxLagMs *int64 `json:"maxLagMs,omitempty"`
547547
WatermarkEmitIntervalMs *int64 `json:"watermarkEmitIntervalMs,omitempty"`
548548
TimestampExtractorClassName *string `json:"timestampExtractorClassName,omitempty"`
549-
ProcessingGuarantee WindowProcessGuarantee `json:"processingGuarantee,omitempty"`
549+
ProcessingGuarantees WindowProcessGuarantee `json:"processingGuarantees,omitempty"`
550550
}
551551

552552
type VPASpec struct {

‎charts/function-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functionmeshes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3786,7 +3786,7 @@ spec:
37863786
maxLagMs:
37873787
format: int64
37883788
type: integer
3789-
processingGuarantee:
3789+
processingGuarantees:
37903790
enum:
37913791
- ATLEAST_ONCE
37923792
- ATMOST_ONCE

‎charts/function-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3805,7 +3805,7 @@ spec:
38053805
maxLagMs:
38063806
format: int64
38073807
type: integer
3808-
processingGuarantee:
3808+
processingGuarantees:
38093809
enum:
38103810
- ATLEAST_ONCE
38113811
- ATMOST_ONCE

‎config/crd/bases/compute.functionmesh.io_functionmeshes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3786,7 +3786,7 @@ spec:
37863786
maxLagMs:
37873787
format: int64
37883788
type: integer
3789-
processingGuarantee:
3789+
processingGuarantees:
37903790
enum:
37913791
- ATLEAST_ONCE
37923792
- ATMOST_ONCE

‎config/crd/bases/compute.functionmesh.io_functions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3783,7 +3783,7 @@ spec:
37833783
maxLagMs:
37843784
format: int64
37853785
type: integer
3786-
processingGuarantee:
3786+
processingGuarantees:
37873787
enum:
37883788
- ATLEAST_ONCE
37893789
- ATMOST_ONCE

0 commit comments

Comments
 (0)