From 00e8c16dd5ac19e6abf382365ff3616d08d836c8 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Tue, 6 Aug 2024 10:26:08 +0100 Subject: [PATCH] Remove some unused pulsar properties (#3866) * remove some unused pulsar properties Signed-off-by: Chris Martin * wip Signed-off-by: Chris Martin --------- Signed-off-by: Chris Martin Co-authored-by: Chris Martin --- config/armada/config.yaml | 4 ---- internal/scheduleringester/config.go | 4 ---- internal/server/configuration/types.go | 8 +++----- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/config/armada/config.yaml b/config/armada/config.yaml index ba6337a19c4..22eaf2e1652 100644 --- a/config/armada/config.yaml +++ b/config/armada/config.yaml @@ -69,13 +69,9 @@ submission: pulsar: URL: "pulsar://pulsar:6650" jobsetEventsTopic: "events" - redisFromPulsarSubscription: "RedisFromPulsar" - dedupTable: pulsar_submit_dedup maxConnectionsPerBroker: 1 compressionType: zlib compressionLevel: faster - eventsPrinter: false - eventsPrinterSubscription: "EventsPrinter" maxAllowedEventsPerMessage: 1000 maxAllowedMessageSize: 4194304 # 4MB sendTimeout: 5s diff --git a/internal/scheduleringester/config.go b/internal/scheduleringester/config.go index b828d78d6df..b6b45270ae7 100644 --- a/internal/scheduleringester/config.go +++ b/internal/scheduleringester/config.go @@ -20,10 +20,6 @@ type Configuration struct { BatchSize int // Maximum time since the last batch before a batch will be inserted into the database BatchDuration time.Duration - // Time for which the pulsar consumer will wait for a new message before retrying - PulsarReceiveTimeout time.Duration - // Time for which the pulsar consumer will back off after receiving an error on trying to receive a message - PulsarBackoffTime time.Duration // If non-nil, configures pprof profiling Profiling *profilingconfig.ProfilingConfig } diff --git a/internal/server/configuration/types.go b/internal/server/configuration/types.go index 4baef849d4f..3351c27ad2d 100644 --- a/internal/server/configuration/types.go +++ b/internal/server/configuration/types.go @@ -57,15 +57,13 @@ type PulsarConfig struct { // Authentication type. For now only "JWT" auth is valid AuthenticationType string // Path to the JWT token (must exist). This must be set if AuthenticationType is "JWT" - JwtTokenPath string - JobsetEventsTopic string - RedisFromPulsarSubscription string + JwtTokenPath string + // The pulsar topic that Jobset Events will be published to + JobsetEventsTopic string // Compression to use. Valid values are "None", "LZ4", "Zlib", "Zstd". Default is "None" CompressionType pulsar.CompressionType // Compression Level to use. Valid values are "Default", "Better", "Faster". Default is "Default" CompressionLevel pulsar.CompressionLevel - // Settings for deduplication, which relies on a postgres server. - DedupTable string // Maximum allowed Events per message MaxAllowedEventsPerMessage int `validate:"gte=0"` // Maximum allowed message size in bytes