diff options
| -rw-r--r-- | kafka/client.py | 6 | ||||
| -rw-r--r-- | kafka/common.py | 4 | ||||
| -rw-r--r-- | test/test_client.py | 4 | ||||
| -rw-r--r-- | test/test_consumer.py | 3 |
4 files changed, 6 insertions, 11 deletions
diff --git a/kafka/client.py b/kafka/client.py index 630e176..2eab1e3 100644 --- a/kafka/client.py +++ b/kafka/client.py @@ -8,8 +8,8 @@ import kafka.common from kafka.common import (TopicAndPartition, BrokerMetadata, ConnectionError, FailedPayloadsError, - PartitionUnavailableError, LeaderUnavailableError, KafkaUnavailableError, - KafkaTimeoutError, + PartitionUnavailableError, LeaderNotAvailableError, + KafkaUnavailableError, KafkaTimeoutError, UnknownTopicOrPartitionError, NotLeaderForPartitionError) from kafka.conn import collect_hosts, KafkaConnection, DEFAULT_SOCKET_TIMEOUT_SECONDS @@ -136,7 +136,7 @@ class KafkaClient(object): leader = self._get_leader_for_partition(payload.topic, payload.partition) if leader is None: - raise LeaderUnavailableError( + raise LeaderNotAvailableError( "Leader not available for topic %s partition %s" % (payload.topic, payload.partition)) diff --git a/kafka/common.py b/kafka/common.py index 6b73410..e8fa31e 100644 --- a/kafka/common.py +++ b/kafka/common.py @@ -158,10 +158,6 @@ class KafkaTimeoutError(KafkaError): pass -class LeaderUnavailableError(KafkaError): - pass - - class PartitionUnavailableError(KafkaError): pass diff --git a/test/test_client.py b/test/test_client.py index 58254fc..dbc9883 100644 --- a/test/test_client.py +++ b/test/test_client.py @@ -7,7 +7,7 @@ from kafka.common import ( ProduceRequest, MetadataResponse, BrokerMetadata, TopicMetadata, PartitionMetadata, TopicAndPartition, KafkaUnavailableError, - LeaderUnavailableError, PartitionUnavailableError + LeaderNotAvailableError, PartitionUnavailableError ) from kafka.protocol import create_message @@ -261,6 +261,6 @@ class TestKafkaClient(unittest2.TestCase): "topic_noleader", 0, [create_message("a"), create_message("b")])] - with self.assertRaises(LeaderUnavailableError): + with self.assertRaises(LeaderNotAvailableError): client.send_produce_request(requests) diff --git a/test/test_consumer.py b/test/test_consumer.py index 778d76a..f0b4e53 100644 --- a/test/test_consumer.py +++ b/test/test_consumer.py @@ -9,8 +9,7 @@ from kafka import KafkaClient from kafka.consumer import SimpleConsumer from kafka.common import ( ProduceRequest, BrokerMetadata, PartitionMetadata, - TopicAndPartition, KafkaUnavailableError, - LeaderUnavailableError, PartitionUnavailableError + TopicAndPartition, PartitionUnavailableError ) from kafka.protocol import ( create_message, KafkaProtocol |