Merge branch 'main' into merlimat-patch-1

apache · Mar 19, 2024 · ceb2a63 · ceb2a63
2 parents 995ba36 + 48be179
commit ceb2a63
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pulsar/schema/schema_avro.py b/pulsar/schema/schema_avro.py
@@ -91,7 +91,8 @@ def decode_message(self, msg: _pulsar.Message):
  writer_schema = self._get_writer_schema(topic, version)
  return self._decode_bytes(msg.data(), writer_schema)
  except Exception as e:
- self._logger.error(f'Failed to get schema info of {topic} version {version}: {e}')
+ msg_id = msg.message_id()
+ self._logger.warn(f'Failed to decode {msg_id} with schema {topic} version {version}: {e}')
  return self._decode_bytes(msg.data(), self._schema)
 
  def _get_writer_schema(self, topic: str, version: int) -> 'dict':

diff --git a/tests/test-conf/standalone-ssl.conf b/tests/test-conf/standalone-ssl.conf
@@ -310,3 +310,8 @@ maxMessageSize=1024000
 
 # Disable consistent hashing to fix flaky `KeySharedConsumerTest#testMultiTopics`.
 subscriptionKeySharedUseConsistentHashing=false
+
+# It's true by default since 2.11. After https://github.com/apache/pulsar/pull/21445, we must configure
+# brokerClientAuthenticationPlugin and brokerClientAuthenticationParameters correctly when enabling topic
+# level policies. Otherwise, no topic could be loaded.
+topicLevelPoliciesEnabled=false