chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed rocketmq partition out of range

Browse Source
This commit is contained in:
agapple
2019-04-03 11:26:31 +08:00
parent d3195ac973
commit 82ed9db8ae
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/src/main/java/com/alibaba/otter/canal/rocketmq/CanalRocketMQProducer.java
View File

@@ -107,12 +107,11 @@ public class CanalRocketMQProducer implements CanalMQProducer {
@Override @Override
public MessageQueue select(List<MessageQueue> mqs, Message msg, Object arg) { public MessageQueue select(List<MessageQueue> mqs, Message msg, Object arg) {
if (index > mqs.size()) { if (index > mqs.size()) {
throw new CanalServerException("partition number is error,config num:" return mqs.get(index % mqs.size());
+ destination.getPartitionsNum() } else {
+ ", mq num: " + mqs.size());
}
return mqs.get(index); return mqs.get(index);
} }
}
}, null); }, null);
} catch (Exception e) { } catch (Exception e) {
logger.error("send flat message to hashed partition error", e); logger.error("send flat message to hashed partition error", e);
@@ -134,8 +133,12 @@ public class CanalRocketMQProducer implements CanalMQProducer {
@Override @Override
public MessageQueue select(List<MessageQueue> mqs, Message msg, Object arg) { public MessageQueue select(List<MessageQueue> mqs, Message msg, Object arg) {
if (partition > mqs.size()) {
return mqs.get(partition % mqs.size());
} else {
return mqs.get(partition); return mqs.get(partition);
} }
}
}, null); }, null);
} }
} catch (MQClientException | RemotingException | MQBrokerException | InterruptedException e) { } catch (MQClientException | RemotingException | MQBrokerException | InterruptedException e) {
@@ -168,12 +171,11 @@ public class CanalRocketMQProducer implements CanalMQProducer {
@Override @Override
public MessageQueue select(List<MessageQueue> mqs, Message msg, Object arg) { public MessageQueue select(List<MessageQueue> mqs, Message msg, Object arg) {
if (index > mqs.size()) { if (index > mqs.size()) {
throw new CanalServerException("partition number is error,config num:" return mqs.get(index % mqs.size());
+ destination.getPartitionsNum() } else {
+ ", mq num: " + mqs.size());
}
return mqs.get(index); return mqs.get(index);
} }
}
}, null); }, null);
} catch (Exception e) { } catch (Exception e) {
logger.error("send flat message to hashed partition error", e); logger.error("send flat message to hashed partition error", e);
@@ -196,8 +198,12 @@ public class CanalRocketMQProducer implements CanalMQProducer {
@Override @Override
public MessageQueue select(List<MessageQueue> mqs, Message msg, Object arg) { public MessageQueue select(List<MessageQueue> mqs, Message msg, Object arg) {
if (partition > mqs.size()) {
return mqs.get(partition % mqs.size());
} else {
return mqs.get(partition); return mqs.get(partition);
} }
}
}, null); }, null);
} catch (Exception e) { } catch (Exception e) {
logger.error("send flat message to fixed partition error", e); logger.error("send flat message to fixed partition error", e);