From 8ac85f882cbf26378a670d2fe4ad4ef3c8c699dd Mon Sep 17 00:00:00 2001 From: Quentin Faidide Date: Mon, 1 Apr 2024 19:07:55 +0300 Subject: [PATCH 1/3] fix: change jetstream buffers discard policy from DiscardOld to DiscardNew Signed-off-by: Quentin Faidide --- pkg/isbsvc/jetstream_service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/isbsvc/jetstream_service.go b/pkg/isbsvc/jetstream_service.go index 7e25203834..c795657117 100644 --- a/pkg/isbsvc/jetstream_service.go +++ b/pkg/isbsvc/jetstream_service.go @@ -114,7 +114,7 @@ func (jss *jetStreamSvc) CreateBuffersAndBuckets(ctx context.Context, buffers, b Name: streamName, Subjects: []string{streamName}, // Use the stream name as the only subject Retention: nats.RetentionPolicy(v.GetInt("stream.retention")), - Discard: nats.DiscardOld, + Discard: nats.DiscardNew, MaxMsgs: v.GetInt64("stream.maxMsgs"), MaxAge: v.GetDuration("stream.maxAge"), MaxBytes: v.GetInt64("stream.maxBytes"), From cf0e5fccf8f7ee999b5475621b03d477c5cb34a1 Mon Sep 17 00:00:00 2001 From: Quentin Faidide Date: Thu, 4 Apr 2024 13:13:29 +0300 Subject: [PATCH 2/3] feat: remove option to set retention policy Signed-off-by: Quentin Faidide --- api/json-schema/schema.json | 2 +- api/openapi-spec/swagger.json | 4 ++-- .../namespaced-controller-wo-crds.yaml | 2 -- .../numaflow-controller-config.yaml | 2 -- config/install.yaml | 2 -- config/namespace-install.yaml | 2 -- docs/APIs.md | 13 ++++++------- docs/core-concepts/inter-step-buffer-service.md | 2 -- docs/operations/numaflow-controller-config.yaml | 2 -- .../reference/configuration/max-message-size.md | 2 +- pkg/apis/numaflow/v1alpha1/generated.proto | 2 +- .../numaflow/v1alpha1/jetstream_buffer_service.go | 2 +- pkg/apis/numaflow/v1alpha1/openapi_generated.go | 2 +- pkg/isb/stores/jetstream/metrics.go | 2 +- pkg/isb/stores/jetstream/reader_test.go | 2 +- pkg/isb/stores/jetstream/writer.go | 6 +----- pkg/isbsvc/jetstream_service.go | 5 +---- ui/src/components/pages/Namespace/index.test.tsx | 2 +- .../ISBServiceCard/ISBServiceCard.test.tsx | 2 +- .../partials/NamespaceListingWrapper/index.test.tsx | 2 +- .../Namespace/partials/PipelineCard/index.test.tsx | 2 +- .../partials/PipelineISBStatus/index.test.tsx | 2 +- .../PipelineISBSummaryStatus/index.test.tsx | 2 +- 23 files changed, 23 insertions(+), 43 deletions(-) diff --git a/api/json-schema/schema.json b/api/json-schema/schema.json index 9575e20969..271d92c598 100644 --- a/api/json-schema/schema.json +++ b/api/json-schema/schema.json @@ -18601,7 +18601,7 @@ "type": "boolean" }, "bufferConfig": { - "description": "Optional configuration for the streams, consumers and buckets to be created in this JetStream service, if specified, it will be merged with the default configuration in numaflow-controller-config. It accepts a YAML format configuration, it may include 4 sections, \"stream\", \"consumer\", \"otBucket\" and \"procBucket\". Available fields under \"stream\" include \"retention\" (e.g. interest, limits, workerQueue), \"maxMsgs\", \"maxAge\" (e.g. 72h), \"replicas\" (1, 3, 5), \"duplicates\" (e.g. 5m). Available fields under \"consumer\" include \"ackWait\" (e.g. 60s) Available fields under \"otBucket\" include \"maxValueSize\", \"history\", \"ttl\" (e.g. 72h), \"maxBytes\", \"replicas\" (1, 3, 5). Available fields under \"procBucket\" include \"maxValueSize\", \"history\", \"ttl\" (e.g. 72h), \"maxBytes\", \"replicas\" (1, 3, 5).", + "description": "Optional configuration for the streams, consumers and buckets to be created in this JetStream service, if specified, it will be merged with the default configuration in numaflow-controller-config. It accepts a YAML format configuration, it may include 4 sections, \"stream\", \"consumer\", \"otBucket\" and \"procBucket\". Available fields under \"stream\" include \"maxMsgs\", \"maxAge\" (e.g. 72h), \"replicas\" (1, 3, 5), \"duplicates\" (e.g. 5m). Available fields under \"consumer\" include \"ackWait\" (e.g. 60s) Available fields under \"otBucket\" include \"maxValueSize\", \"history\", \"ttl\" (e.g. 72h), \"maxBytes\", \"replicas\" (1, 3, 5). Available fields under \"procBucket\" include \"maxValueSize\", \"history\", \"ttl\" (e.g. 72h), \"maxBytes\", \"replicas\" (1, 3, 5).", "type": "string" }, "containerTemplate": { diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index bb0db10138..5f0a134fa8 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "Numaflow", - "version": "latest" + "version": "vdev-3" }, "paths": {}, "definitions": { @@ -18597,7 +18597,7 @@ "type": "boolean" }, "bufferConfig": { - "description": "Optional configuration for the streams, consumers and buckets to be created in this JetStream service, if specified, it will be merged with the default configuration in numaflow-controller-config. It accepts a YAML format configuration, it may include 4 sections, \"stream\", \"consumer\", \"otBucket\" and \"procBucket\". Available fields under \"stream\" include \"retention\" (e.g. interest, limits, workerQueue), \"maxMsgs\", \"maxAge\" (e.g. 72h), \"replicas\" (1, 3, 5), \"duplicates\" (e.g. 5m). Available fields under \"consumer\" include \"ackWait\" (e.g. 60s) Available fields under \"otBucket\" include \"maxValueSize\", \"history\", \"ttl\" (e.g. 72h), \"maxBytes\", \"replicas\" (1, 3, 5). Available fields under \"procBucket\" include \"maxValueSize\", \"history\", \"ttl\" (e.g. 72h), \"maxBytes\", \"replicas\" (1, 3, 5).", + "description": "Optional configuration for the streams, consumers and buckets to be created in this JetStream service, if specified, it will be merged with the default configuration in numaflow-controller-config. It accepts a YAML format configuration, it may include 4 sections, \"stream\", \"consumer\", \"otBucket\" and \"procBucket\". Available fields under \"stream\" include \"maxMsgs\", \"maxAge\" (e.g. 72h), \"replicas\" (1, 3, 5), \"duplicates\" (e.g. 5m). Available fields under \"consumer\" include \"ackWait\" (e.g. 60s) Available fields under \"otBucket\" include \"maxValueSize\", \"history\", \"ttl\" (e.g. 72h), \"maxBytes\", \"replicas\" (1, 3, 5). Available fields under \"procBucket\" include \"maxValueSize\", \"history\", \"ttl\" (e.g. 72h), \"maxBytes\", \"replicas\" (1, 3, 5).", "type": "string" }, "containerTemplate": { diff --git a/config/advanced-install/namespaced-controller-wo-crds.yaml b/config/advanced-install/namespaced-controller-wo-crds.yaml index 41fb7acec6..48339e6a92 100644 --- a/config/advanced-install/namespaced-controller-wo-crds.yaml +++ b/config/advanced-install/namespaced-controller-wo-crds.yaml @@ -189,8 +189,6 @@ data: bufferConfig: | # The default properties of the buffers (streams) to be created in this JetStream service stream: - # 0: Limits, 1: Interest, 2: WorkQueue - retention: 0 maxMsgs: 100000 maxAge: 72h maxBytes: -1 diff --git a/config/base/controller-manager/numaflow-controller-config.yaml b/config/base/controller-manager/numaflow-controller-config.yaml index b966f3d807..9896c25290 100644 --- a/config/base/controller-manager/numaflow-controller-config.yaml +++ b/config/base/controller-manager/numaflow-controller-config.yaml @@ -60,8 +60,6 @@ data: bufferConfig: | # The default properties of the buffers (streams) to be created in this JetStream service stream: - # 0: Limits, 1: Interest, 2: WorkQueue - retention: 0 maxMsgs: 100000 maxAge: 72h maxBytes: -1 diff --git a/config/install.yaml b/config/install.yaml index 3ce65c0c17..543a5a3cc8 100644 --- a/config/install.yaml +++ b/config/install.yaml @@ -17147,8 +17147,6 @@ data: bufferConfig: | # The default properties of the buffers (streams) to be created in this JetStream service stream: - # 0: Limits, 1: Interest, 2: WorkQueue - retention: 0 maxMsgs: 100000 maxAge: 72h maxBytes: -1 diff --git a/config/namespace-install.yaml b/config/namespace-install.yaml index b937cffc03..6eaa4e4ec4 100644 --- a/config/namespace-install.yaml +++ b/config/namespace-install.yaml @@ -17050,8 +17050,6 @@ data: bufferConfig: | # The default properties of the buffers (streams) to be created in this JetStream service stream: - # 0: Limits, 1: Interest, 2: WorkQueue - retention: 0 maxMsgs: 100000 maxAge: 72h maxBytes: -1 diff --git a/docs/APIs.md b/docs/APIs.md index ea7eeaee37..42b78797e8 100644 --- a/docs/APIs.md +++ b/docs/APIs.md @@ -2447,13 +2447,12 @@ created in this JetStream service, if specified, it will be merged with the default configuration in numaflow-controller-config. It accepts a YAML format configuration, it may include 4 sections, “stream”, “consumer”, “otBucket” and “procBucket”. Available fields under “stream” -include “retention” (e.g. interest, limits, workerQueue), “maxMsgs”, -“maxAge” (e.g. 72h), “replicas” (1, 3, 5), “duplicates” (e.g. 5m). -Available fields under “consumer” include “ackWait” (e.g. 60s) Available -fields under “otBucket” include “maxValueSize”, “history”, “ttl” -(e.g. 72h), “maxBytes”, “replicas” (1, 3, 5). Available fields under -“procBucket” include “maxValueSize”, “history”, “ttl” (e.g. 72h), -“maxBytes”, “replicas” (1, 3, 5). +include “maxMsgs”, “maxAge” (e.g. 72h), “replicas” (1, 3, 5), +“duplicates” (e.g. 5m). Available fields under “consumer” include +“ackWait” (e.g. 60s) Available fields under “otBucket” include +“maxValueSize”, “history”, “ttl” (e.g. 72h), “maxBytes”, “replicas” (1, +3, 5). Available fields under “procBucket” include “maxValueSize”, +“history”, “ttl” (e.g. 72h), “maxBytes”, “replicas” (1, 3, 5).

diff --git a/docs/core-concepts/inter-step-buffer-service.md b/docs/core-concepts/inter-step-buffer-service.md index 5af8f6028a..ef8154c426 100644 --- a/docs/core-concepts/inter-step-buffer-service.md +++ b/docs/core-concepts/inter-step-buffer-service.md @@ -113,8 +113,6 @@ Both these 2 places expect a YAML format configuration like below: bufferConfig: | # The properties of the buffers (streams) to be created in this JetStream service stream: - # 0: Limits, 1: Interest, 2: WorkQueue - retention: 1 maxMsgs: 30000 maxAge: 168h maxBytes: -1 diff --git a/docs/operations/numaflow-controller-config.yaml b/docs/operations/numaflow-controller-config.yaml index e8e6a8af19..4d9eb541d4 100644 --- a/docs/operations/numaflow-controller-config.yaml +++ b/docs/operations/numaflow-controller-config.yaml @@ -56,8 +56,6 @@ data: bufferConfig: | # The default properties of the buffers (streams) to be created in this JetStream service stream: - # 0: Limits, 1: Interest, 2: WorkQueue - retention: 0 maxMsgs: 2000000 maxAge: 168h maxBytes: -1 diff --git a/docs/user-guide/reference/configuration/max-message-size.md b/docs/user-guide/reference/configuration/max-message-size.md index 3ff86624a8..6e4a055311 100644 --- a/docs/user-guide/reference/configuration/max-message-size.md +++ b/docs/user-guide/reference/configuration/max-message-size.md @@ -22,4 +22,4 @@ spec: It's not recommended to use values over `8388608` (8MB) but `max_payload` can be set up to `67108864` (64MB). -Please be aware that if you increase the max message size of the `InterStepBufferService`, you probably will also need to change some other limits. For example, if the size of each messages is as large as 8MB, then 100 messages flowing in the pipeline will make each of the Inter-Step Buffer need at least 800MB of disk space to store the messages, and the memory consumption will also be high, that will probably cause the Inter-Step Buffer Service to crash. In that case, you might need to update the retention policy in the Inter-Step Buffer Service to make sure the messages are not stored for too long. Check out the [Inter-Step Buffer Service](../../../core-concepts/inter-step-buffer-service.md#buffer-configuration) for more details. +Please be aware that if you increase the max message size of the `InterStepBufferService`, you probably will also need to change some other limits. For example, if the size of each messages is as large as 8MB, then 100 messages flowing in the pipeline will make each of the Inter-Step Buffer need at least 800MB of storage to store the messages, and the memory consumption overhead will also be high, which could cause the Inter-Step Buffer Service to crash. In that eventuality, Check out the [Inter-Step Buffer Service](../../../core-concepts/inter-step-buffer-service.md#buffer-configuration) for more details. diff --git a/pkg/apis/numaflow/v1alpha1/generated.proto b/pkg/apis/numaflow/v1alpha1/generated.proto index ea5b760b5c..88a996e673 100644 --- a/pkg/apis/numaflow/v1alpha1/generated.proto +++ b/pkg/apis/numaflow/v1alpha1/generated.proto @@ -646,7 +646,7 @@ message JetStreamBufferService { // Optional configuration for the streams, consumers and buckets to be created in this JetStream service, if specified, it will be merged with the default configuration in numaflow-controller-config. // It accepts a YAML format configuration, it may include 4 sections, "stream", "consumer", "otBucket" and "procBucket". - // Available fields under "stream" include "retention" (e.g. interest, limits, workerQueue), "maxMsgs", "maxAge" (e.g. 72h), "replicas" (1, 3, 5), "duplicates" (e.g. 5m). + // Available fields under "stream" include "maxMsgs", "maxAge" (e.g. 72h), "replicas" (1, 3, 5), "duplicates" (e.g. 5m). // Available fields under "consumer" include "ackWait" (e.g. 60s) // Available fields under "otBucket" include "maxValueSize", "history", "ttl" (e.g. 72h), "maxBytes", "replicas" (1, 3, 5). // Available fields under "procBucket" include "maxValueSize", "history", "ttl" (e.g. 72h), "maxBytes", "replicas" (1, 3, 5). diff --git a/pkg/apis/numaflow/v1alpha1/jetstream_buffer_service.go b/pkg/apis/numaflow/v1alpha1/jetstream_buffer_service.go index 8bdf138287..4e9b5157e9 100644 --- a/pkg/apis/numaflow/v1alpha1/jetstream_buffer_service.go +++ b/pkg/apis/numaflow/v1alpha1/jetstream_buffer_service.go @@ -58,7 +58,7 @@ type JetStreamBufferService struct { StartArgs []string `json:"startArgs,omitempty" protobuf:"bytes,9,rep,name=startArgs"` // Optional configuration for the streams, consumers and buckets to be created in this JetStream service, if specified, it will be merged with the default configuration in numaflow-controller-config. // It accepts a YAML format configuration, it may include 4 sections, "stream", "consumer", "otBucket" and "procBucket". - // Available fields under "stream" include "retention" (e.g. interest, limits, workerQueue), "maxMsgs", "maxAge" (e.g. 72h), "replicas" (1, 3, 5), "duplicates" (e.g. 5m). + // Available fields under "stream" include "maxMsgs", "maxAge" (e.g. 72h), "replicas" (1, 3, 5), "duplicates" (e.g. 5m). // Available fields under "consumer" include "ackWait" (e.g. 60s) // Available fields under "otBucket" include "maxValueSize", "history", "ttl" (e.g. 72h), "maxBytes", "replicas" (1, 3, 5). // Available fields under "procBucket" include "maxValueSize", "history", "ttl" (e.g. 72h), "maxBytes", "replicas" (1, 3, 5). diff --git a/pkg/apis/numaflow/v1alpha1/openapi_generated.go b/pkg/apis/numaflow/v1alpha1/openapi_generated.go index 5c5e058aa0..ff010abe8c 100644 --- a/pkg/apis/numaflow/v1alpha1/openapi_generated.go +++ b/pkg/apis/numaflow/v1alpha1/openapi_generated.go @@ -2222,7 +2222,7 @@ func schema_pkg_apis_numaflow_v1alpha1_JetStreamBufferService(ref common.Referen }, "bufferConfig": { SchemaProps: spec.SchemaProps{ - Description: "Optional configuration for the streams, consumers and buckets to be created in this JetStream service, if specified, it will be merged with the default configuration in numaflow-controller-config. It accepts a YAML format configuration, it may include 4 sections, \"stream\", \"consumer\", \"otBucket\" and \"procBucket\". Available fields under \"stream\" include \"retention\" (e.g. interest, limits, workerQueue), \"maxMsgs\", \"maxAge\" (e.g. 72h), \"replicas\" (1, 3, 5), \"duplicates\" (e.g. 5m). Available fields under \"consumer\" include \"ackWait\" (e.g. 60s) Available fields under \"otBucket\" include \"maxValueSize\", \"history\", \"ttl\" (e.g. 72h), \"maxBytes\", \"replicas\" (1, 3, 5). Available fields under \"procBucket\" include \"maxValueSize\", \"history\", \"ttl\" (e.g. 72h), \"maxBytes\", \"replicas\" (1, 3, 5).", + Description: "Optional configuration for the streams, consumers and buckets to be created in this JetStream service, if specified, it will be merged with the default configuration in numaflow-controller-config. It accepts a YAML format configuration, it may include 4 sections, \"stream\", \"consumer\", \"otBucket\" and \"procBucket\". Available fields under \"stream\" include \"maxMsgs\", \"maxAge\" (e.g. 72h), \"replicas\" (1, 3, 5), \"duplicates\" (e.g. 5m). Available fields under \"consumer\" include \"ackWait\" (e.g. 60s) Available fields under \"otBucket\" include \"maxValueSize\", \"history\", \"ttl\" (e.g. 72h), \"maxBytes\", \"replicas\" (1, 3, 5). Available fields under \"procBucket\" include \"maxValueSize\", \"history\", \"ttl\" (e.g. 72h), \"maxBytes\", \"replicas\" (1, 3, 5).", Type: []string{"string"}, Format: "", }, diff --git a/pkg/isb/stores/jetstream/metrics.go b/pkg/isb/stores/jetstream/metrics.go index 13480c6dd2..a5c49f0e9d 100644 --- a/pkg/isb/stores/jetstream/metrics.go +++ b/pkg/isb/stores/jetstream/metrics.go @@ -56,7 +56,7 @@ var isbSoftUsage = promauto.NewGaugeVec(prometheus.GaugeOpts{ Help: "percentage of buffer soft usage", }, []string{"buffer"}) -// isbSolidUsage is used to indicate of buffer that is used up, it is calculated based on the messages remain in the stream (if it's not Limits retention policy) +// isbSolidUsage is used to indicate buffer usage, it is calculated based on the messages remaining in the stream. var isbSolidUsage = promauto.NewGaugeVec(prometheus.GaugeOpts{ Subsystem: "isb_jetstream", Name: "buffer_solid_usage", diff --git a/pkg/isb/stores/jetstream/reader_test.go b/pkg/isb/stores/jetstream/reader_test.go index 8e33e4fd4e..635f399bfa 100644 --- a/pkg/isb/stores/jetstream/reader_test.go +++ b/pkg/isb/stores/jetstream/reader_test.go @@ -185,7 +185,7 @@ func addStream(t *testing.T, js nats.JetStreamContext, streamName string) { Name: streamName, Subjects: []string{streamName}, Retention: nats.WorkQueuePolicy, - Discard: nats.DiscardOld, + Discard: nats.DiscardNew, MaxMsgs: 100, // Storage: nats.FileStorage, Duplicates: 2 * 60 * time.Second, diff --git a/pkg/isb/stores/jetstream/writer.go b/pkg/isb/stores/jetstream/writer.go index 2d10a2b8f1..45dbd98e3d 100644 --- a/pkg/isb/stores/jetstream/writer.go +++ b/pkg/isb/stores/jetstream/writer.go @@ -101,11 +101,7 @@ func (jw *jetStreamWriter) runStatusChecker(ctx context.Context) { } var solidUsage, softUsage float64 softUsage = (float64(c.NumPending) + float64(c.NumAckPending)) / float64(jw.opts.maxLength) - if s.Config.Retention == nats.LimitsPolicy { - solidUsage = softUsage - } else { - solidUsage = float64(s.State.Msgs) / float64(jw.opts.maxLength) - } + solidUsage = float64(s.State.Msgs) / float64(jw.opts.maxLength) // TODO: solid usage calculation might be incorrect due to incorrect JetStream metadata issue caused by pod migration, need to revisit this later. // We should set up alerts with sort of rules to detect the metadata issue. For example, solidUsage is too much greater than softUsage for a while. if solidUsage >= jw.opts.bufferUsageLimit && softUsage >= jw.opts.bufferUsageLimit { diff --git a/pkg/isbsvc/jetstream_service.go b/pkg/isbsvc/jetstream_service.go index c795657117..5ec8cf0fda 100644 --- a/pkg/isbsvc/jetstream_service.go +++ b/pkg/isbsvc/jetstream_service.go @@ -113,7 +113,7 @@ func (jss *jetStreamSvc) CreateBuffersAndBuckets(ctx context.Context, buffers, b if _, err := js.AddStream(&nats.StreamConfig{ Name: streamName, Subjects: []string{streamName}, // Use the stream name as the only subject - Retention: nats.RetentionPolicy(v.GetInt("stream.retention")), + Retention: nats.WorkQueuePolicy, Discard: nats.DiscardNew, MaxMsgs: v.GetInt64("stream.maxMsgs"), MaxAge: v.GetDuration("stream.maxAge"), @@ -298,9 +298,6 @@ func (jss *jetStreamSvc) GetBufferInfo(ctx context.Context, buffer string) (*Buf return nil, fmt.Errorf("failed to get consumer information of stream %q", streamName) } totalMessages := int64(stream.State.Msgs) - if stream.Config.Retention == nats.LimitsPolicy { - totalMessages = int64(consumer.NumPending) + int64(consumer.NumAckPending) - } bufferInfo := &BufferInfo{ Name: buffer, PendingCount: int64(consumer.NumPending), diff --git a/ui/src/components/pages/Namespace/index.test.tsx b/ui/src/components/pages/Namespace/index.test.tsx index 34d7176594..3ed47c7b38 100644 --- a/ui/src/components/pages/Namespace/index.test.tsx +++ b/ui/src/components/pages/Namespace/index.test.tsx @@ -197,7 +197,7 @@ const mockISBRawData = { }, }, streamConfig: - "consumer:\n ackwait: 60s\n maxackpending: 25000\notbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 3h\nprocbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 72h\nstream:\n duplicates: 60s\n maxage: 72h\n maxbytes: -1\n maxmsgs: 100000\n replicas: 3\n retention: 0\n storage: 0\n", + "consumer:\n ackwait: 60s\n maxackpending: 25000\notbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 3h\nprocbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 72h\nstream:\n duplicates: 60s\n maxage: 72h\n maxbytes: -1\n maxmsgs: 100000\n replicas: 3\n storage: 0\n", }, }, type: "jetstream", diff --git a/ui/src/components/pages/Namespace/partials/NamespaceListingWrapper/ISBServiceCard/ISBServiceCard.test.tsx b/ui/src/components/pages/Namespace/partials/NamespaceListingWrapper/ISBServiceCard/ISBServiceCard.test.tsx index 7374ef979f..e9778661a1 100644 --- a/ui/src/components/pages/Namespace/partials/NamespaceListingWrapper/ISBServiceCard/ISBServiceCard.test.tsx +++ b/ui/src/components/pages/Namespace/partials/NamespaceListingWrapper/ISBServiceCard/ISBServiceCard.test.tsx @@ -159,7 +159,7 @@ const mockData = { }, }, streamConfig: - "consumer:\n ackwait: 60s\n maxackpending: 25000\notbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 3h\nprocbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 72h\nstream:\n duplicates: 60s\n maxage: 72h\n maxbytes: -1\n maxmsgs: 100000\n replicas: 3\n retention: 0\n storage: 0\n", + "consumer:\n ackwait: 60s\n maxackpending: 25000\notbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 3h\nprocbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 72h\nstream:\n duplicates: 60s\n maxage: 72h\n maxbytes: -1\n maxmsgs: 100000\n replicas: 3\n storage: 0\n", }, }, type: "jetstream", diff --git a/ui/src/components/pages/Namespace/partials/NamespaceListingWrapper/index.test.tsx b/ui/src/components/pages/Namespace/partials/NamespaceListingWrapper/index.test.tsx index 1dd259cff8..6fdb8ab034 100644 --- a/ui/src/components/pages/Namespace/partials/NamespaceListingWrapper/index.test.tsx +++ b/ui/src/components/pages/Namespace/partials/NamespaceListingWrapper/index.test.tsx @@ -213,7 +213,7 @@ const mockISBRawData = { }, }, streamConfig: - "consumer:\n ackwait: 60s\n maxackpending: 25000\notbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 3h\nprocbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 72h\nstream:\n duplicates: 60s\n maxage: 72h\n maxbytes: -1\n maxmsgs: 100000\n replicas: 3\n retention: 0\n storage: 0\n", + "consumer:\n ackwait: 60s\n maxackpending: 25000\notbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 3h\nprocbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 72h\nstream:\n duplicates: 60s\n maxage: 72h\n maxbytes: -1\n maxmsgs: 100000\n replicas: 3\n storage: 0\n", }, }, type: "jetstream", diff --git a/ui/src/components/pages/Namespace/partials/PipelineCard/index.test.tsx b/ui/src/components/pages/Namespace/partials/PipelineCard/index.test.tsx index 0a76789ca6..87b20e027c 100644 --- a/ui/src/components/pages/Namespace/partials/PipelineCard/index.test.tsx +++ b/ui/src/components/pages/Namespace/partials/PipelineCard/index.test.tsx @@ -516,7 +516,7 @@ const mockISBData = { }, }, streamConfig: - "consumer:\n ackwait: 60s\n maxackpending: 25000\notbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 3h\nprocbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 72h\nstream:\n duplicates: 60s\n maxage: 72h\n maxbytes: -1\n maxmsgs: 100000\n replicas: 3\n retention: 0\n storage: 0\n", + "consumer:\n ackwait: 60s\n maxackpending: 25000\notbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 3h\nprocbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 72h\nstream:\n duplicates: 60s\n maxage: 72h\n maxbytes: -1\n maxmsgs: 100000\n replicas: 3\n storage: 0\n", }, }, type: "jetstream", diff --git a/ui/src/components/pages/Pipeline/partials/PipelineISBStatus/index.test.tsx b/ui/src/components/pages/Pipeline/partials/PipelineISBStatus/index.test.tsx index cfefcf3779..3dd86e3268 100644 --- a/ui/src/components/pages/Pipeline/partials/PipelineISBStatus/index.test.tsx +++ b/ui/src/components/pages/Pipeline/partials/PipelineISBStatus/index.test.tsx @@ -151,7 +151,7 @@ const mockData = { }, }, streamConfig: - "consumer:\n ackwait: 60s\n maxackpending: 25000\notbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 3h\nprocbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 72h\nstream:\n duplicates: 60s\n maxage: 72h\n maxbytes: -1\n maxmsgs: 100000\n replicas: 3\n retention: 0\n storage: 0\n", + "consumer:\n ackwait: 60s\n maxackpending: 25000\notbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 3h\nprocbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 72h\nstream:\n duplicates: 60s\n maxage: 72h\n maxbytes: -1\n maxmsgs: 100000\n replicas: 3\n storage: 0\n", }, }, type: "jetstream", diff --git a/ui/src/components/pages/Pipeline/partials/PipelineISBSummaryStatus/index.test.tsx b/ui/src/components/pages/Pipeline/partials/PipelineISBSummaryStatus/index.test.tsx index ea0ff2f48c..a93cfebeb4 100644 --- a/ui/src/components/pages/Pipeline/partials/PipelineISBSummaryStatus/index.test.tsx +++ b/ui/src/components/pages/Pipeline/partials/PipelineISBSummaryStatus/index.test.tsx @@ -151,7 +151,7 @@ const mockData = { }, }, streamConfig: - "consumer:\n ackwait: 60s\n maxackpending: 25000\notbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 3h\nprocbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 72h\nstream:\n duplicates: 60s\n maxage: 72h\n maxbytes: -1\n maxmsgs: 100000\n replicas: 3\n retention: 0\n storage: 0\n", + "consumer:\n ackwait: 60s\n maxackpending: 25000\notbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 3h\nprocbucket:\n history: 1\n maxbytes: 0\n maxvaluesize: 0\n replicas: 3\n storage: 0\n ttl: 72h\nstream:\n duplicates: 60s\n maxage: 72h\n maxbytes: -1\n maxmsgs: 100000\n replicas: 3\n storage: 0\n", }, }, type: "jetstream", From 1bd1fbe0d50d4625504992d58a4df9f0860cf502 Mon Sep 17 00:00:00 2001 From: Quentin Faidide Date: Thu, 4 Apr 2024 13:35:06 +0300 Subject: [PATCH 3/3] chore: codegen ran with latest as the version Signed-off-by: Quentin Faidide --- api/openapi-spec/swagger.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 5f0a134fa8..6e237043a1 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "Numaflow", - "version": "vdev-3" + "version": "latest" }, "paths": {}, "definitions": {