Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
pulsar
提交
77f63709
pulsar
项目概览
apache
/
pulsar
通知
129
Star
40
Fork
3
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Wiki
1
Wiki
分析
仓库
DevOps
项目成员
Pages
pulsar
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Pages
分析
分析
仓库分析
DevOps
Wiki
1
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
提交
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
77f63709
编写于
8月 01, 2019
作者:
X
Xiaobing Fang
提交者:
Sijie Guo
8月 01, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix : retention size policy bug (#4825)
the 0 size limit can't means "infinite" size quota
上级
8d195753
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
25 addition
and
3 deletion
+25
-3
managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
...org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
+1
-1
managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java
...ache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java
+2
-0
managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixReadTest.java
...apache/bookkeeper/mledger/impl/OffloadPrefixReadTest.java
+1
-0
managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java
...org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java
+13
-0
managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ReadOnlyCursorTest.java
...rg/apache/bookkeeper/mledger/impl/ReadOnlyCursorTest.java
+8
-2
未找到文件。
managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
浏览文件 @
77f63709
...
...
@@ -1883,7 +1883,7 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback {
private
boolean
isLedgerRetentionOverSizeQuota
()
{
// Handle the -1 size limit as "infinite" size quota
return
config
.
getRetentionSizeInMB
()
>
0
return
config
.
getRetentionSizeInMB
()
>
=
0
&&
TOTAL_SIZE_UPDATER
.
get
(
this
)
>
((
long
)
config
.
getRetentionSizeInMB
())
*
1024
*
1024
;
}
...
...
managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadLedgerDeleteTest.java
浏览文件 @
77f63709
...
...
@@ -47,6 +47,7 @@ public class OffloadLedgerDeleteTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setMinimumRolloverTime
(
0
,
TimeUnit
.
SECONDS
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setOffloadLedgerDeletionLag
(
5
,
TimeUnit
.
MINUTES
);
config
.
setLedgerOffloader
(
offloader
);
config
.
setClock
(
clock
);
...
...
@@ -109,6 +110,7 @@ public class OffloadLedgerDeleteTest extends MockedBookKeeperTestCase {
config
.
setMinimumRolloverTime
(
0
,
TimeUnit
.
SECONDS
);
config
.
setRetentionTime
(
5
,
TimeUnit
.
MINUTES
);
config
.
setOffloadLedgerDeletionLag
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
config
.
setClock
(
clock
);
...
...
managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixReadTest.java
浏览文件 @
77f63709
...
...
@@ -65,6 +65,7 @@ public class OffloadPrefixReadTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setMinimumRolloverTime
(
0
,
TimeUnit
.
SECONDS
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
...
...
managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java
浏览文件 @
77f63709
...
...
@@ -65,6 +65,7 @@ public class OffloadPrefixTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setMinimumRolloverTime
(
0
,
TimeUnit
.
SECONDS
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
int
i
=
0
;
...
...
@@ -110,6 +111,7 @@ public class OffloadPrefixTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setMinimumRolloverTime
(
0
,
TimeUnit
.
SECONDS
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
...
...
@@ -136,6 +138,7 @@ public class OffloadPrefixTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setMinimumRolloverTime
(
0
,
TimeUnit
.
SECONDS
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
...
...
@@ -171,6 +174,7 @@ public class OffloadPrefixTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setMinimumRolloverTime
(
0
,
TimeUnit
.
SECONDS
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
...
...
@@ -379,6 +383,7 @@ public class OffloadPrefixTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setMinimumRolloverTime
(
0
,
TimeUnit
.
SECONDS
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
...
...
@@ -410,6 +415,7 @@ public class OffloadPrefixTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setMinimumRolloverTime
(
0
,
TimeUnit
.
SECONDS
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
...
...
@@ -445,6 +451,7 @@ public class OffloadPrefixTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setMinimumRolloverTime
(
0
,
TimeUnit
.
SECONDS
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
...
...
@@ -688,6 +695,7 @@ public class OffloadPrefixTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setMinimumRolloverTime
(
0
,
TimeUnit
.
SECONDS
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
...
...
@@ -739,6 +747,7 @@ public class OffloadPrefixTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setOffloadAutoTriggerSizeThresholdBytes
(
100
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
...
...
@@ -774,6 +783,7 @@ public class OffloadPrefixTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setOffloadAutoTriggerSizeThresholdBytes
(
100
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
...
...
@@ -834,6 +844,7 @@ public class OffloadPrefixTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setOffloadAutoTriggerSizeThresholdBytes
(
100
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
...
...
@@ -884,6 +895,7 @@ public class OffloadPrefixTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setOffloadAutoTriggerSizeThresholdBytes
(
100
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
...
...
@@ -919,6 +931,7 @@ public class OffloadPrefixTest extends MockedBookKeeperTestCase {
config
.
setMaxEntriesPerLedger
(
10
);
config
.
setOffloadAutoTriggerSizeThresholdBytes
(
0
);
config
.
setRetentionTime
(
10
,
TimeUnit
.
MINUTES
);
config
.
setRetentionSizeInMB
(
10
);
config
.
setLedgerOffloader
(
offloader
);
ManagedLedgerImpl
ledger
=
(
ManagedLedgerImpl
)
factory
.
open
(
"my_test_ledger"
,
config
);
...
...
managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ReadOnlyCursorTest.java
浏览文件 @
77f63709
...
...
@@ -103,7 +103,10 @@ public class ReadOnlyCursorTest extends MockedBookKeeperTestCase {
@Test
void
skip
()
throws
Exception
{
ManagedLedger
ledger
=
factory
.
open
(
"skip"
,
new
ManagedLedgerConfig
().
setMaxEntriesPerLedger
(
2
).
setRetentionTime
(
1
,
TimeUnit
.
HOURS
));
new
ManagedLedgerConfig
()
.
setMaxEntriesPerLedger
(
2
)
.
setRetentionTime
(
1
,
TimeUnit
.
HOURS
)
.
setRetentionSizeInMB
(-
1
));
int
N
=
10
;
...
...
@@ -152,7 +155,10 @@ public class ReadOnlyCursorTest extends MockedBookKeeperTestCase {
@Test
void
skipMultiple
()
throws
Exception
{
ManagedLedger
ledger
=
factory
.
open
(
"skip"
,
new
ManagedLedgerConfig
().
setMaxEntriesPerLedger
(
7
).
setRetentionTime
(
1
,
TimeUnit
.
HOURS
));
new
ManagedLedgerConfig
()
.
setMaxEntriesPerLedger
(
7
)
.
setRetentionTime
(
1
,
TimeUnit
.
HOURS
)
.
setRetentionSizeInMB
(-
1
));
int
N
=
30
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录