Remove some unused pulsar properties (#3866)

* remove some unused pulsar properties Signed-off-by: Chris Martin <[email protected]> * wip Signed-off-by: Chris Martin <[email protected]> --------- Signed-off-by: Chris Martin <[email protected]> Co-authored-by: Chris Martin <[email protected]>
armadaproject · Aug 6, 2024 · 00e8c16 · 00e8c16
1 parent 079a9da
commit 00e8c16
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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