Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2016-07-26 #1

Open
wants to merge 1,075 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1075 commits
Select commit Hold shift + click to select a range
2974dbe
fixed #215 producer 中添加 topic 有效性检查。
YangJodie Aug 28, 2013
cc6f849
#228 topic 路由信息已经找到之后,不需要再通过默认 topic 再获取一次。
YangJodie Aug 29, 2013
80913a1
#227 获取默认 topic 路由信息时需要做特殊处理,不添加与虚拟环境运行相关的前缀。
YangJodie Aug 29, 2013
acce4b1
#230 修复从ProcessQueue取顺序消息,设置消费状态错误的问题
vintagewang Aug 29, 2013
7283225
Merge branch 'develop' of gitlab.alibaba-inc.com:middleware/rocketmq …
vintagewang Aug 29, 2013
f56c3ab
#227 修改 namespace
YangJodie Aug 30, 2013
5928e52
#227 #231 添加 project group 配置工具。
YangJodie Aug 30, 2013
8d59545
#227 #231 添加通过 value 反向查询 key 的工具。
YangJodie Aug 30, 2013
ce2c696
增加遗漏日志
Sep 2, 2013
1d077ca
修改log4j 输出路径
Sep 2, 2013
a1017f4
#4 修改brokerstats打印顺序
vintagewang Sep 3, 2013
3b45529
增加 参数去除空格
Sep 4, 2013
541bc69
Merge branch 'develop' of http://gitlab.alibaba-inc.com/middleware/ro…
Sep 4, 2013
3e70db1
fixed #242 修复线上环境关闭自动创建topic后,客户端仍然打印多余日志的问题。
vintagewang Sep 5, 2013
45aa2bb
增加producer 初始设置topic 和启动时按初始topic 寻址。
Sep 6, 2013
b9be77a
Merge branch 'develop' of http://gitlab.alibaba-inc.com/middleware/ro…
Sep 6, 2013
6574547
fixed #245 修复打印消费进度时,不能全部打印的问题。
vintagewang Sep 7, 2013
efac82c
增加 reblance 日志
Sep 9, 2013
c3b98c5
#4 删除AddTopic接口,转移到支付宝客户端。
vintagewang Sep 9, 2013
20b32ed
#4 客户端部分内部对象方法公开,供支付宝客户端进行扩展。
vintagewang Sep 9, 2013
6fcaf3f
客户端日志配置允许第三方jar包覆盖
vintagewang Sep 10, 2013
f3e920c
修改日志
vintagewang Sep 10, 2013
af3f5aa
#245 优化rebalance算法,全部队列平均分配。
YangJodie Sep 10, 2013
b20b061
#244 去掉未获取到虚拟运行环境的 project group 时的异常信息,记录一下获取到project group即可。
YangJodie Sep 10, 2013
bf25a08
#4 测试
YangJodie Sep 10, 2013
a794b0c
Merge branch 'develop' of gitlab.alibaba-inc.com:middleware/rocketmq …
vintagewang Sep 10, 2013
f6c2b02
#4 删除tools工程测试代码 & 格式化
vintagewang Sep 10, 2013
e7f3f5f
#4 修改版本号为3.0.0-beta7
vintagewang Sep 10, 2013
21ca536
#4 注释掉taobao.parent
vintagewang Sep 10, 2013
5b6bd00
#236 创建 topic 时做系统保留字验证。
YangJodie Sep 10, 2013
53274d8
Merge branch 'develop' of gitlab.alibaba-inc.com:middleware/rocketmq …
YangJodie Sep 10, 2013
757e332
#247 消息重试时 %RETRY% 作为前缀标识,与同是虚拟项目分组前缀的 %PROJECT_% 冲突。将 %PROJECT_% 改成后…
YangJodie Sep 11, 2013
9aa14a0
#233 添加按时间回溯消费进度bean
YangJodie Sep 12, 2013
d5ea57d
#233 新增按 consumerGroup,topic,timestamp 回溯消费进度逻辑
YangJodie Sep 12, 2013
c88a2f1
#233 新增 command tools
YangJodie Sep 12, 2013
e2fed12
#233 1.执行结果输出 2.允许按照日期格式输入,精确到毫秒
YangJodie Sep 12, 2013
5c2112d
#233 删除测试代码
YangJodie Sep 12, 2013
acd5c3d
#233 打印 force 状态
YangJodie Sep 12, 2013
59f14c4
#233 去掉日期与时间之间的空格,用#分隔。
YangJodie Sep 12, 2013
6fdf7d7
修改配置文件加载类,能自动创建目录
Sep 13, 2013
b94f01b
#4 整理tools命令,将消息查询命令拆分成3个子命令
vintagewang Sep 16, 2013
4e78e25
#4 修改版本号为3.0.0-SNAPSHOT
vintagewang Sep 16, 2013
c00e17f
#4 修改版本号为3.0.0-SNAPSHOT
vintagewang Sep 16, 2013
fbbb23d
#4 “修改配置文件加载类,能自动创建目录”此功能已转移到支付宝自定义客户端
vintagewang Sep 17, 2013
e388624
#253 格式化pom,升级netty依赖到4.0.9
vintagewang Sep 17, 2013
895ef24
#234 按照消息ID查询命令行工具增加消息Body输出
YangJodie Sep 17, 2013
e8caa6d
#253 修改命令行顺序
vintagewang Sep 17, 2013
60b946b
#255 增加发送消息Hook,消费消息Hook
vintagewang Sep 18, 2013
7b965e3
#255 增加tostring方法
vintagewang Sep 18, 2013
3a37c32
#255 去除无用参数
vintagewang Sep 18, 2013
99d3089
#255 将consumer对象的实现对象修改为protected
vintagewang Sep 18, 2013
4eff3a2
#255 为hook调用增加参数
vintagewang Sep 22, 2013
49d6769
#255 为hook增加group参数
vintagewang Sep 22, 2013
7172c5c
#253 调整rebalance日志
vintagewang Sep 22, 2013
32ee740
#253 调整消息id查询body路径
vintagewang Sep 23, 2013
35f3c30
更新MQVersion,3.0.0-SNAPSHOT
vintagewang Sep 24, 2013
7f1c9db
#258 Consumer连接管理没有定时检查不可能的连接。
YangJodie Sep 24, 2013
d418831
#258 update log.
YangJodie Sep 24, 2013
aec27f5
#258 consumer注册时,要更新最后变更时间
vintagewang Sep 25, 2013
3d5a303
发布beta8版本
vintagewang Sep 25, 2013
8192198
发布beta8版本,注释parentpom
vintagewang Sep 25, 2013
00ef17f
更改命令名字。
vintagewang Sep 27, 2013
2276f4a
为工具类程序,增加默认订阅组
vintagewang Sep 27, 2013
48df8ef
为工具类程序,增加默认订阅组
vintagewang Sep 27, 2013
b6e4f4d
#260 修复tags过滤产生堆积消息假象的问题
vintagewang Sep 28, 2013
05182fd
#261 为安装包增加调试程序
vintagewang Sep 28, 2013
0165e40
#262 为Broker统计信息中增加延时进度
vintagewang Sep 28, 2013
8572385
#261 测试程序,设置instanceName
vintagewang Sep 28, 2013
9a25efe
#261 打印增加换行
vintagewang Sep 28, 2013
f4692c7
#261 测试程序允许订阅表达式为null
vintagewang Sep 28, 2013
3b94ff7
修改日志打印
vintagewang Sep 30, 2013
3a95be5
#253 对于发送消息失败,增加URL说明
vintagewang Oct 7, 2013
72c160d
fixed #226 消费进度查询api,增加最后一条消息的时间戳
vintagewang Oct 7, 2013
66d29b6
#253 更新README
vintagewang Oct 7, 2013
6745dbc
#253 删除多余的example
vintagewang Oct 7, 2013
36499ff
#253 修改错误异常信息
vintagewang Oct 7, 2013
d664fd1
输出最后消息提交时间
Oct 9, 2013
83c4efe
#253 修改README,增加代码行数说明
vintagewang Oct 11, 2013
a7bfa49
#253 Name Server增加过期连接扫描
vintagewang Oct 12, 2013
eb34778
#253 Name Server增加过期连接扫描
vintagewang Oct 12, 2013
c4d7c19
#253 为Remoting增加SO_REUSEADDR选项。
vintagewang Oct 12, 2013
049d769
#253 当broker意外下线时,要清除对应的集群信息
vintagewang Oct 13, 2013
4f58915
#253 Name Server,修改变量名
vintagewang Oct 13, 2013
ec26216
#253 修改消息压缩默认Level,由9改为5
vintagewang Oct 13, 2013
545b6a9
#253 修改消息offset重置的 包名
vintagewang Oct 13, 2013
4fd0a4b
#253 去除消费进度打印时间戳,由于已有打印项已经占满正行,无法再增加新列
vintagewang Oct 13, 2013
1c0dc01
#253 将Connection命令拆分成两个独立的子命令,分别处理producer、consumer
vintagewang Oct 13, 2013
eb29ad5
Merge branch 'develop' of gitlab.alibaba-inc.com:middleware/rocketmq …
vintagewang Oct 13, 2013
2d4d66b
#253 发送消息超时时间由之前默认10s改为3s
vintagewang Oct 13, 2013
158594d
#253 zipLevel参数设置代码笔误
vintagewang Oct 13, 2013
69cd863
#253 超时情况下,取消之前关闭连接的动作,防止产生连锁反映
vintagewang Oct 14, 2013
fdd2f18
#253 zip 压缩level增加get set方法,允许应用设置
vintagewang Oct 14, 2013
6b4df7f
#253 修改readme
vintagewang Oct 14, 2013
463d01d
#253 修改beta8版本为3.0.0-SNAPSHOT,准备发正式版本
vintagewang Oct 15, 2013
77fcc13
#253 排除一些无法通过的测试用例
vintagewang Oct 17, 2013
b597f90
#265 Name Server增加获取Namspace下所有配置的功能
vintagewang Oct 17, 2013
9747890
#253 格式化代码
vintagewang Oct 17, 2013
21563c5
fixed #269 修复客户端连接地址显示错误的问题(针对支付宝环境修改)
vintagewang Oct 17, 2013
2f3a7b1
#253 修改develop.sh
vintagewang Oct 17, 2013
0fd2f9a
#253 mqadmin在命令不存在情况下,给出错误提示
vintagewang Oct 17, 2013
24c6b03
Merge branch 'develop' of gitlab.alibaba-inc.com:middleware/rocketmq …
vintagewang Oct 17, 2013
180d35a
#271 优化checkpoint机制
vintagewang Oct 18, 2013
6da9536
#253 consumer流控时,修复打印日志过多的问题。
vintagewang Oct 18, 2013
c36ec60
Merge branch 'develop' of gitlab.alibaba-inc.com:middleware/rocketmq …
vintagewang Oct 18, 2013
b0f0e97
#253 修复PullConsumer例子少收消息的问题。
vintagewang Oct 18, 2013
4d7c7bf
#253 文件保留时间由默认12小时改为24小时
vintagewang Oct 18, 2013
94c8446
#253 数据恢复时,增加日志
vintagewang Oct 18, 2013
02b1e3c
#253 消息保存时间默认改成48小时
vintagewang Oct 18, 2013
bb78732
Merge branch 'develop' of gitlab.alibaba-inc.com:middleware/rocketmq …
vintagewang Oct 18, 2013
3ebddb2
#253 对factory对象的生命周期管理进行优化。
vintagewang Oct 19, 2013
abfc9da
#253 对各个客户端服务对象的状态位进行优化
vintagewang Oct 19, 2013
5a5595a
Merge branch 'develop' of gitlab.alibaba-inc.com:middleware/rocketmq …
vintagewang Oct 19, 2013
657ec1c
#253 修改PullConsumer例子
vintagewang Oct 19, 2013
2f3e7d6
#253 为集群命令增加tps输出
vintagewang Oct 20, 2013
42901b4
#253 为集群命令增加tps输出
vintagewang Oct 20, 2013
7e659ef
#253 为集群命令增加tps输出
vintagewang Oct 20, 2013
4002b1f
#253 集群命令按照BrokerName来排序
vintagewang Oct 20, 2013
01ea893
#253 优化消费进度查询命令
vintagewang Oct 20, 2013
617c82a
#253 优化消费进度查询命令
vintagewang Oct 20, 2013
65c39db
#253 优化消费进度查询命令
vintagewang Oct 20, 2013
816c068
#253 优化消费进度查询命令
vintagewang Oct 20, 2013
9e58a00
#253 优化消费进度查询命令
vintagewang Oct 20, 2013
13276f6
#253 优化消费进度查询命令
vintagewang Oct 20, 2013
66420fa
#253 优化消费进度查询命令
vintagewang Oct 20, 2013
62300d0
#253 优化消费进度查询命令
vintagewang Oct 20, 2013
da0d76f
#253 优化消费进度查询命令
vintagewang Oct 20, 2013
c698e95
#253 Netty Channel地址解析容错。
vintagewang Oct 20, 2013
6e7c3a2
#253 修改集群tps 打印格式
vintagewang Oct 20, 2013
46431c5
#253 修改集群tps 打印格式
vintagewang Oct 20, 2013
119f213
#253 修改集群tps 打印格式
vintagewang Oct 20, 2013
b879d34
#253 增加更新broker配置文件命令
vintagewang Oct 20, 2013
03caa9d
#253 发布3.0.0-final版
vintagewang Oct 20, 2013
7772f54
#253 发布3.0.0-final版,去除parrent注释,depoly到mvn库
vintagewang Oct 20, 2013
4f8edf6
#253 发布3.0.0-final版,增加parrent注释,准备合并到master
vintagewang Oct 20, 2013
bb4f664
#272 load之前启动IndexService
vintagewang Oct 20, 2013
e4eadab
#272 优化IndexService关闭流程
vintagewang Oct 20, 2013
d4e3172
#253 格式化代码
vintagewang Oct 21, 2013
85f49bb
#253 发布一个优化版本,对宕机重启速度进行优化 3.0.1
vintagewang Oct 21, 2013
c526720
#253 发布一个优化版本,对宕机重启速度进行优化 3.0.1,修改parrent pom
vintagewang Oct 21, 2013
e91b82e
#253 开始开发3.0.2-SNAPSHOT版本
vintagewang Oct 21, 2013
5a80b12
#276 为每日消息增加统计。
vintagewang Oct 23, 2013
5ca4dfc
#276 为每日消息增加统计。
vintagewang Oct 23, 2013
00e5de4
#276 为每日消息增加统计。调整命令行打印格式
vintagewang Oct 23, 2013
c8fc99c
#276 为每日消息增加统计。调整scadule参数
vintagewang Oct 24, 2013
d7aa33d
修改一处日志打印错误的问题
vintagewang Oct 24, 2013
8fc216d
release配置修改
agapple Oct 25, 2013
d768922
修改回3.0.1-SNAPSHOT
agapple Oct 25, 2013
e3e8df5
Merge pull request #278 from agapple/develop
vintagewang Oct 25, 2013
df80e31
发布3.0.2版本
vintagewang Oct 28, 2013
88f0b26
发布3.0.2版本
vintagewang Oct 28, 2013
97c921f
发布3.0.2版本
vintagewang Oct 28, 2013
8a1e20b
修改pom,开始开发3.0.3-SNAPSHOT版本
vintagewang Oct 28, 2013
358ed5a
注释掉parrent sontype
vintagewang Oct 28, 2013
fbe1c67
fixed #280 修复pulcosumer导致broker打印日志过多的问题
vintagewang Oct 29, 2013
98cad11
#280 Broker针对PullConsumer的订阅关系变更不打印日志
vintagewang Oct 29, 2013
5af510c
发布3.0.3版本,解决服务器因为pullconsumer导致打印日志过多的问题
vintagewang Oct 29, 2013
5435809
#285 Broker发送消息线程池增加流控机制,在线程池繁忙情况下,快速向应用报错,防止发生雪崩效应。
vintagewang Nov 5, 2013
7be8fe6
修改pom版本号,3.0.4-SNAPSHOT
vintagewang Nov 5, 2013
4d29c6b
#285 Broker统计信息里增加写入队列的实时排队请求数
vintagewang Nov 6, 2013
4ae7ad8
#285 Broker订阅线程池队列size也增加限制
vintagewang Nov 6, 2013
b1cbe2e
#286 unlock操作使用finaly操作保证能一定调用到
vintagewang Nov 6, 2013
c037315
message中的常量定义转移到MessageConst类。
vintagewang Nov 8, 2013
22ae73a
修改下报错文案,线程池繁忙。
vintagewang Nov 8, 2013
6659b40
增加打印property
vintagewang Nov 10, 2013
3e935be
#292 优化重置消费进度逻辑,即使consumer没有启动也能重置
vintagewang Nov 13, 2013
66ab19d
针对Fastjson版本过低导致的异常提供issue url来帮助定位问题。
vintagewang Nov 15, 2013
a2ab1dd
更新流控文案
vintagewang Nov 15, 2013
0c3a857
增加一个按照时间重置offset的方法
vintagewang Nov 16, 2013
d3af2eb
修改消息属性注释
vintagewang Nov 16, 2013
fb85677
修改流控间隔时间。
vintagewang Nov 17, 2013
be13428
修复索引文件没有正常删除的问题
vintagewang Nov 18, 2013
3ab8506
fixed #294 修复因为个别版本jvm无法识别gc相关参数导致启动失败的问题
vintagewang Nov 20, 2013
257a16c
发布3.0.4-open版本
vintagewang Nov 21, 2013
a26ec3f
发布3.0.4版本
vintagewang Nov 21, 2013
09e487b
开始开发3.0.5版本
vintagewang Nov 21, 2013
6007836
netty升级到4.0.12,fastjson升级到1.1.37
vintagewang Nov 22, 2013
383f279
解决 properties 中文乱码的问题。
YangJodie Nov 22, 2013
9da97c0
修改windows启动配置文件,java内存参数
vintagewang Nov 24, 2013
e7325df
修复Math.abs(Integer.min_value)依然为负数的问题
allenzhu Nov 26, 2013
29ef20d
Merge branch 'develop' of gitlab.alibaba-inc.com:middleware/rocketmq …
allenzhu Nov 26, 2013
5fcf5e9
修复Math.abs(Integer.min_value)依然为负数的问题 #295
allenzhu Nov 26, 2013
618cbe4
#295 putKey抛异常时,增加内部变量打印
vintagewang Nov 27, 2013
fb21203
fix无法回溯消息
allenzhu Nov 27, 2013
b72d2fe
Merge branch 'develop' of gitlab.alibaba-inc.com:middleware/rocketmq …
allenzhu Nov 27, 2013
c47f28b
fix无法回溯消息
allenzhu Nov 28, 2013
8e78b7e
修改pom,导致在mvn2下编译不过的问题。
vintagewang Nov 28, 2013
93313db
fixed #298 修复多网卡下获取主机ip可能有误的问题
vintagewang Nov 30, 2013
883f277
netty升级到4.0.13
vintagewang Dec 2, 2013
bfad470
发布3.0.5版本
vintagewang Dec 2, 2013
ef8a592
广播消息重置消费进度时,需要设置instacneName
vintagewang Dec 2, 2013
87eaddc
增加注释
vintagewang Dec 2, 2013
9fd80a8
增加主备部署,配置文件模版
vintagewang Dec 3, 2013
d6d4c5c
将pom.xml的淘宝parent依赖去掉,并合并到主干
vintagewang Dec 4, 2013
d72a0c3
发布开源3.0.5-open版本
vintagewang Dec 5, 2013
40f5841
发布开源3.0.5-open版本,增加doc,source插件
vintagewang Dec 5, 2013
084f90c
fixed #302 对ProcessQueue中写入消息逻辑进行优化,避免消息总数计数不准影响到流控功能。
vintagewang Dec 6, 2013
53e6deb
删除log4j不支持的配置项,MaxBackupIndex
vintagewang Dec 9, 2013
1836992
默认不生成java doc
vintagewang Dec 10, 2013
9d172d6
消息发送失败,重试次数可配置。
vintagewang Dec 11, 2013
45e6fca
#310 fixed 清楚 brokerAddr 时与 topicTable 之间存在并发问题,加锁解决。
YangJodie Dec 16, 2013
f5e162b
修复UtilAll.isBlank逻辑
vintagewang Dec 16, 2013
5a0934d
修复根据Offset查询消息的代码错误,订阅者没有正确设置
vintagewang Dec 17, 2013
bdfb5d4
启动过程增加异常打印
vintagewang Dec 17, 2013
894d13f
开始开发3.0.6版本
vintagewang Dec 17, 2013
43ba367
过滤掉生成文档
vintagewang Dec 17, 2013
7f53cef
fixed #311 修复打印日志错误
vintagewang Dec 17, 2013
56fdd64
fixed #302 从ProcessQueue中删除消息,也要判断是否有消息存在。
vintagewang Dec 17, 2013
08466ba
#316 优化consumer第一次启动时的消费逻辑。
vintagewang Dec 23, 2013
c96e2fa
增加多个版本号,修改代码demo
vintagewang Dec 24, 2013
84472e8
修改注释,consumer第一次启动时,默认回溯时间改为半小时
vintagewang Dec 24, 2013
cf96b85
#316 修改注释。
vintagewang Dec 24, 2013
36ea6a7
#317 分支完成后 continue 进入下一次循环,同时修复错误的日志。
YangJodie Dec 25, 2013
34ed7ed
#317 添加解锁时的日志。
YangJodie Dec 25, 2013
8236733
#317 修改日志。
YangJodie Dec 25, 2013
b391442
#317 本地定时重试消费时,如果当前 mq 已经被 rebalance 删除,则跳出重试。
YangJodie Dec 25, 2013
871004a
更新Example,增加注释。
vintagewang Dec 25, 2013
c9156f2
#317 新生成lockEntry时继续往下执行,去掉continue.
YangJodie Dec 25, 2013
9c4c9c5
发布3.0.6版本
vintagewang Dec 26, 2013
e36da55
合并develop到master,3.0.6,去除taobao parent依赖
vintagewang Dec 26, 2013
b4b8ead
修改pom为3.0.7-SNAPSHOT
vintagewang Dec 30, 2013
bc8f8db
fixed #325 优化注册订阅关系流程,优化消费进度查询流程, topic取消订阅后,过滤掉。
vintagewang Jan 6, 2014
6ecfc64
#326 去除写入消息索引的流控机制
vintagewang Jan 7, 2014
068f4f1
fixed #322 and fixed #326 修复消息索引保存的时间差单位,由毫秒改为秒,防止索引文件创建时间过长,但是消息过少情况…
vintagewang Jan 7, 2014
b57679e
#325 修复注销订阅关系的逻辑错误。
vintagewang Jan 7, 2014
94526bf
名称错误,应该是RocketMQ,不是Metaq
hengyunabc Jan 8, 2014
a53b38e
Merge pull request #327 from hengyunabc/patch-1
vintagewang Jan 8, 2014
4641329
#329 根据时间进行 offset 重置,客户端无需再重启。
YangJodie Jan 9, 2014
864d382
#330 通过 topic、group 查询到订阅的客户端,查询客户端当前的消费进度。
YangJodie Jan 9, 2014
0b6e8cb
#331 如果是广播消费,则不需要进行锁判断,也无需定时去 broker 更新锁状态。
YangJodie Jan 9, 2014
d467173
#329 resetOffsetByTime、resetOffsetByTimeOld两个 command 放一块儿。
YangJodie Jan 9, 2014
426bd74
#329 如果ProcessQueue是dropped状态,不需要直接更新 offset
YangJodie Jan 9, 2014
db5d3ad
#329 #330 每个 broker 上有所有的 consumer 连接,故只需要在一个 broker 执行即可
YangJodie Jan 9, 2014
d6eee2c
#330 将 ip:port 的方式改为 clientId
YangJodie Jan 9, 2014
56bf460
#329 #330 注册客户端支持的RPC CODE
YangJodie Jan 9, 2014
4bd8707
#329 #330 记录关键日志、源ip
YangJodie Jan 9, 2014
2c73a65
#329 等待时间 60s 改为 10s
YangJodie Jan 9, 2014
948cbe8
#330 调整显示
YangJodie Jan 9, 2014
80a3d61
#330 修正 CFNullable 包
YangJodie Jan 10, 2014
839993e
发布3.0.7版本
vintagewang Jan 10, 2014
5986cf6
发布3.0.7版本
vintagewang Jan 10, 2014
bfb2273
增加异常Issue链接,同一个Group内不同的订阅关系的问题。
vintagewang Jan 10, 2014
afedde8
fixed #333 修复updateProcessQueueTableInRebalance方法中遍历HashMap删除元素的错误逻辑
vintagewang Jan 14, 2014
d20f391
fixed #334 修复remoting模块异步调用没有回调的问题。
vintagewang Jan 15, 2014
838fa8c
对于队列不存在的异常增加URL,并格式化代码
vintagewang Jan 15, 2014
5ef7ef1
开始开发3.0.8-SNAPSHOT版本
vintagewang Jan 15, 2014
bc3d897
#337 增加对JDK7的兼容,主要修改了释放PAGECACHE的逻辑
vintagewang Jan 15, 2014
35e3d5e
#340 为PushConsumer每次pull消息时,增加开关来控制是否上传订阅关系
vintagewang Jan 17, 2014
7340169
fixed #341 为磁盘这种情况增加更详细的信息
vintagewang Jan 17, 2014
1173883
格式化代码
vintagewang Jan 17, 2014
9f1d849
根据Findbugs修复所有发现的问题。
vintagewang Jan 23, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
target/mvn-eclipse-cache.properties
target/

# eclipse
.classpath
.project
.settings
.idea/
*.iml
191 changes: 191 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction, and
distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by the copyright
owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all other entities
that control, are controlled by, or are under common control with that entity.
For the purposes of this definition, "control" means (i) the power, direct or
indirect, to cause the direction or management of such entity, whether by
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity exercising
permissions granted by this License.

"Source" form shall mean the preferred form for making modifications, including
but not limited to software source code, documentation source, and configuration
files.

"Object" form shall mean any form resulting from mechanical transformation or
translation of a Source form, including but not limited to compiled object code,
generated documentation, and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or Object form, made
available under the License, as indicated by a copyright notice that is included
in or attached to the work (an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object form, that
is based on (or derived from) the Work and for which the editorial revisions,
annotations, elaborations, or other modifications represent, as a whole, an
original work of authorship. For the purposes of this License, Derivative Works
shall not include works that remain separable from, or merely link (or bind by
name) to the interfaces of, the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including the original version
of the Work and any modifications or additions to that Work or Derivative Works
thereof, that is intentionally submitted to Licensor for inclusion in the Work
by the copyright owner or by an individual or Legal Entity authorized to submit
on behalf of the copyright owner. For the purposes of this definition,
"submitted" means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems, and
issue tracking systems that are managed by, or on behalf of, the Licensor for
the purpose of discussing and improving the Work, but excluding communication
that is conspicuously marked or otherwise designated in writing by the copyright
owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
of whom a Contribution has been received by Licensor and subsequently
incorporated within the Work.

2. Grant of Copyright License.

Subject to the terms and conditions of this License, each Contributor hereby
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the Work and such
Derivative Works in Source or Object form.

3. Grant of Patent License.

Subject to the terms and conditions of this License, each Contributor hereby
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable (except as stated in this section) patent license to make, have
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
such license applies only to those patent claims licensable by such Contributor
that are necessarily infringed by their Contribution(s) alone or by combination
of their Contribution(s) with the Work to which such Contribution(s) was
submitted. If You institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
Contribution incorporated within the Work constitutes direct or contributory
patent infringement, then any patent licenses granted to You under this License
for that Work shall terminate as of the date such litigation is filed.

4. Redistribution.

You may reproduce and distribute copies of the Work or Derivative Works thereof
in any medium, with or without modifications, and in Source or Object form,
provided that You meet the following conditions:

You must give any other recipients of the Work or Derivative Works a copy of
this License; and
You must cause any modified files to carry prominent notices stating that You
changed the files; and
You must retain, in the Source form of any Derivative Works that You distribute,
all copyright, patent, trademark, and attribution notices from the Source form
of the Work, excluding those notices that do not pertain to any part of the
Derivative Works; and
If the Work includes a "NOTICE" text file as part of its distribution, then any
Derivative Works that You distribute must include a readable copy of the
attribution notices contained within such NOTICE file, excluding those notices
that do not pertain to any part of the Derivative Works, in at least one of the
following places: within a NOTICE text file distributed as part of the
Derivative Works; within the Source form or documentation, if provided along
with the Derivative Works; or, within a display generated by the Derivative
Works, if and wherever such third-party notices normally appear. The contents of
the NOTICE file are for informational purposes only and do not modify the
License. You may add Your own attribution notices within Derivative Works that
You distribute, alongside or as an addendum to the NOTICE text from the Work,
provided that such additional attribution notices cannot be construed as
modifying the License.
You may add Your own copyright statement to Your modifications and may provide
additional or different license terms and conditions for use, reproduction, or
distribution of Your modifications, or for any such Derivative Works as a whole,
provided Your use, reproduction, and distribution of the Work otherwise complies
with the conditions stated in this License.

5. Submission of Contributions.

Unless You explicitly state otherwise, any Contribution intentionally submitted
for inclusion in the Work by You to the Licensor shall be under the terms and
conditions of this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify the terms of
any separate license agreement you may have executed with Licensor regarding
such Contributions.

6. Trademarks.

This License does not grant permission to use the trade names, trademarks,
service marks, or product names of the Licensor, except as required for
reasonable and customary use in describing the origin of the Work and
reproducing the content of the NOTICE file.

7. Disclaimer of Warranty.

Unless required by applicable law or agreed to in writing, Licensor provides the
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
including, without limitation, any warranties or conditions of TITLE,
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
solely responsible for determining the appropriateness of using or
redistributing the Work and assume any risks associated with Your exercise of
permissions under this License.

8. Limitation of Liability.

In no event and under no legal theory, whether in tort (including negligence),
contract, or otherwise, unless required by applicable law (such as deliberate
and grossly negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special, incidental,
or consequential damages of any character arising as a result of this License or
out of the use or inability to use the Work (including but not limited to
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
any and all other commercial damages or losses), even if such Contributor has
been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability.

While redistributing the Work or Derivative Works thereof, You may choose to
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
other liability obligations and/or rights consistent with this License. However,
in accepting such obligations, You may act only on Your own behalf and on Your
sole responsibility, not on behalf of any other Contributor, and only if You
agree to indemnify, defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason of your
accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work

To apply the Apache License to your work, attach the following boilerplate
notice, with the fields enclosed by brackets "[]" replaced with your own
identifying information. (Don't include the brackets!) The text should be
enclosed in the appropriate comment syntax for the file format. We also
recommend that a file or class name and description of purpose be included on
the same "printed page" as the copyright notice for easier identification within
third-party archives.

Copyright 2013 Alibaba Group Holding Limited

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Empty file removed README
Empty file.
43 changes: 40 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,41 @@
RocketMQ
========
### RocketMQ是什么?
RocketMQ是一款分布式、队列模型的消息中间件,具有以下特点:

It's a MQ
* 能够保证严格的消息顺序
* 提供丰富的消息拉取模式
* 高效的订阅者水平扩展能力
* 实时的消息订阅机制
* 亿级消息堆积能力


----------

### 如何开始?
* [下载安装包](https://github.com/alibaba/RocketMQ/releases)
* [Quick Start](https://github.com/alibaba/RocketMQ/wiki/Quick-Start)
* [通过Wiki了解更多](https://github.com/alibaba/RocketMQ/wiki)

----------

### 开源协议
[Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) Copyright (C) 2010-2013 Alibaba Group Holding Limited

----------

### 开发规范
* 代码使用Eclipse代码样式格式化,提交代码前须格式化[rocketmq.java.code.style.xml](https://github.com/alibaba/RocketMQ/blob/master/docs/rocketmq.java.code.style.xml)
* Java源文件使用Unix换行、UTF-8文件编码
* 请在git clone命令之前执行`git config --global core.autocrlf false`,确保本地代码使用Unix换行格式
* 请在develop分支上开发
* 每次提交须有Issue关联,可在git提交注释中增加`#issue号码`进行关联

----------

### 联系我们

* [向我们提交建议、BUG、寻求技术帮助](https://github.com/alibaba/RocketMQ/issues/new)
* 欢迎参与RocketMQ项目,只需在Github上fork、pull request即可。
* [到新浪微博交流RocketMQ](http://q.weibo.com/1628465)
* 加入QQ群交流,5776652

----------
6 changes: 6 additions & 0 deletions benchmark/consumer.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh

#
# $Id: consumer.sh 1831 2013-05-16 01:39:51Z shijia.wxr $
#
sh ./runclass.sh com.alibaba.rocketmq.example.benchmark.Consumer $@
4 changes: 2 additions & 2 deletions benchmark/runclass.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ fi
BASE_DIR=$(dirname $0)/..
CLASSPATH=.:${BASE_DIR}/conf:${CLASSPATH}

JAVA_OPT_1="-server -Xms4g -Xmx4g -Xmn1g -XX:PermSize=128m -XX:MaxPermSize=320m"
JAVA_OPT_1="-server -Xms1g -Xmx1g -Xmn256m -XX:PermSize=128m -XX:MaxPermSize=320m"
JAVA_OPT_2="-XX:+UseConcMarkSweepGC -XX:+UseCMSCompactAtFullCollection -XX:CMSInitiatingOccupancyFraction=70 -XX:+CMSParallelRemarkEnabled -XX:SoftRefLRUPolicyMSPerMB=0 -XX:+CMSClassUnloadingEnabled -XX:SurvivorRatio=8 -XX:+DisableExplicitGC"
JAVA_OPT_3="-verbose:gc -Xloggc:${HOME}/metaq_gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
JAVA_OPT_3="-verbose:gc -Xloggc:${HOME}/rocketmq_client_gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
JAVA_OPT_4="-XX:-OmitStackTraceInFastThrow"
JAVA_OPT_5="-Djava.ext.dirs=${BASE_DIR}/lib"
JAVA_OPT_6="-cp ${CLASSPATH}"
Expand Down
6 changes: 6 additions & 0 deletions benchmark/tproducer.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh

#
# $Id: producer.sh 1831 2013-05-16 01:39:51Z shijia.wxr $
#
sh ./runclass.sh com.alibaba.rocketmq.example.benchmark.TransactionProducer $@
34 changes: 34 additions & 0 deletions bin/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
### 操作系统调优
在生产环境部署Broker前,必须要执行os.sh,对操作系统进行调优

**P.S: os.sh只能执行一次,需要sudo root权限**

### 启动broker
* Unix平台

`nohup sh mqbroker &`

* Windows平台(仅支持64位)

`mqbroker.exe`

### 关闭broker
sh mqshutdown broker

### 启动Name Server
* Unix平台

`nohup sh mqnamesrv &`

* Windows平台(仅支持64位)

`mqnamesrv.exe`

### 关闭Name Server
sh mqshutdown namesrv

### 更新或创建Topic
sh mqadmin updateTopic -b 127.0.0.1:10911 -t TopicA

### 更新或创建订阅组
sh mqadmin updateSubGroup -b 127.0.0.1:10911 -g SubGroupA
4 changes: 2 additions & 2 deletions bin/mqconsole → bin/mqadmin
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

#
# $Id: mqbroker 1472 2013-04-17 06:51:11Z shijia.wxr $
# $Id: mqbroker 1840 2013-05-16 02:13:59Z shijia.wxr $
#

if [ -z "$ROCKETMQ_HOME" ] ; then
Expand Down Expand Up @@ -31,4 +31,4 @@ fi

export ROCKETMQ_HOME

sh ${ROCKETMQ_HOME}/bin/runserver.sh com.alibaba.rocketmq.console.ConsoleStartup $@
sh ${ROCKETMQ_HOME}/bin/tools.sh com.alibaba.rocketmq.tools.command.MQAdminStartup $@
Binary file added bin/mqadmin.exe
Binary file not shown.
26 changes: 26 additions & 0 deletions bin/mqadmin.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<java>
<debug>false</debug>

<javahome>${JAVA_HOME}</javahome>

<jvmtype>server</jvmtype>

<mainclass>com.alibaba.rocketmq.tools.command.MQAdminStartup</mainclass>

<properties>
<java.ext.dirs>${cpd}/../lib</java.ext.dirs>
<rocketmq.home.dir>${cpd}/..</rocketmq.home.dir>
</properties>

<classpaths>
</classpaths>

<options>
<-Xms512m></-Xms512m>
<-Xmx1g></-Xmx1g>
<-XX:NewSize>256M</-XX:NewSize>
<-XX:MaxNewSize>512M</-XX:MaxNewSize>
<-XX:PermSize>128M</-XX:PermSize>
<-XX:MaxPermSize>128M</-XX:MaxPermSize>
</options>
</java>
Binary file added bin/mqbroker.exe
Binary file not shown.
26 changes: 26 additions & 0 deletions bin/mqbroker.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<java>
<debug>false</debug>

<javahome>${JAVA_HOME}</javahome>

<jvmtype>server</jvmtype>

<mainclass>com.alibaba.rocketmq.broker.BrokerStartup</mainclass>

<properties>
<java.ext.dirs>${cpd}/../lib</java.ext.dirs>
<rocketmq.home.dir>${cpd}/..</rocketmq.home.dir>
</properties>

<classpaths>
</classpaths>

<options>
<-Xms512m></-Xms512m>
<-Xmx1g></-Xmx1g>
<-XX:NewSize>256M</-XX:NewSize>
<-XX:MaxNewSize>512M</-XX:MaxNewSize>
<-XX:PermSize>128M</-XX:PermSize>
<-XX:MaxPermSize>128M</-XX:MaxPermSize>
</options>
</java>
Binary file added bin/mqnamesrv.exe
Binary file not shown.
Loading