[GitHub] incubator-rocketmq pull request #133: [ROCKETMQ-249] Do not attempt to clear...

2017-09-22 Thread shroman
Github user shroman commented on a diff in the pull request:

https://github.com/apache/incubator-rocketmq/pull/133#discussion_r140425575
  
--- Diff: 
store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java ---
@@ -1509,65 +1514,62 @@ private boolean isTimeToDelete() {
 return false;
 }
 
-private boolean isSpaceToDelete() {
-double ratio = 
DefaultMessageStore.this.getMessageStoreConfig().getDiskMaxUsedSpaceRatio() / 
100.0;
+double getDiskUsageRatio() {
+return UtilAll.getDiskPartitionSpaceUsedPercent(
+
DefaultMessageStore.this.getMessageStoreConfig().getStorePathCommitLog());
+}
 
-cleanImmediately = false;
+double getQueueSpace() {
+return 
UtilAll.getDiskPartitionSpaceUsedPercent(StorePathConfigHelper
+
.getStorePathConsumeQueue(DefaultMessageStore.this.getMessageStoreConfig().getStorePathRootDir()));
+}
 
-{
-String storePathPhysic = 
DefaultMessageStore.this.getMessageStoreConfig().getStorePathCommitLog();
-double physicRatio = 
UtilAll.getDiskPartitionSpaceUsedPercent(storePathPhysic);
-if (physicRatio > diskSpaceWarningLevelRatio) {
-boolean diskok = 
DefaultMessageStore.this.runningFlags.getAndMakeDiskFull();
-if (diskok) {
-DefaultMessageStore.log.error("physic disk maybe 
full soon " + physicRatio + ", so mark disk full");
-}
+/**
+ * Checks if cleaning on the disk is needed.
+ *
+ * @param usageRatio Usage ratio.
+ * @param allowedRatio Allowed ratio.
+ * @return True if cleaning is needed, otherwise 
false.
+ */
+private boolean needCleaning(double usageRatio, double 
allowedRatio) {
+if (usageRatio == -1)
--- End diff --

Thanks, fixed.


---


[GitHub] incubator-rocketmq pull request #133: [ROCKETMQ-249] Do not attempt to clear...

2017-09-21 Thread dongeforever
Github user dongeforever commented on a diff in the pull request:

https://github.com/apache/incubator-rocketmq/pull/133#discussion_r140402297
  
--- Diff: 
store/src/test/java/org/apache/rocketmq/store/CleanCommitLogServiceTest.java ---
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+package org.apache.rocketmq.store;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import org.apache.rocketmq.common.BrokerConfig;
+import org.apache.rocketmq.store.config.MessageStoreConfig;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+/**
+ * Tests for CleanCommitLogService.
+ */
+public class CleanCommitLogServiceTest {
+DefaultMessageStore messageStore;
+DefaultMessageStore.CleanCommitLogService cleanCommitLogService;
+
+// CleanCommitLogService class.
+Class clazz;
+
+@Before
+public void setUp() throws Exception {
+clazz = 
Class.forName("org.apache.rocketmq.store.DefaultMessageStore$CleanCommitLogService");
+
+MessageStoreConfig messageStoreConfig = new MessageStoreConfig();
+messageStore = new DefaultMessageStore(
+messageStoreConfig, null, null, new BrokerConfig());
+
+Field cleanCommitLogServiceField = 
messageStore.getClass().getDeclaredField("cleanCommitLogService");
+cleanCommitLogServiceField.setAccessible(true);
+
+cleanCommitLogService = 
spy((DefaultMessageStore.CleanCommitLogService) 
(cleanCommitLogServiceField.get(messageStore)));
+}
+
+@After
+public void tearDown() throws Exception {
+}
+
+@Test
+public void isSpaceToDeleteNoCommitLog() throws Exception {
+Method m = clazz.getDeclaredMethod("isSpaceToDelete");
+m.setAccessible(true);
+
+Assert.assertFalse((boolean) m.invoke(cleanCommitLogService));
+}
+
+@Test
+public void isSpaceToDeleteWithCommitLogNoQueue() throws Exception {
+try {
+messageStore.start();
+messageStore.load();
+
+Method m = clazz.getDeclaredMethod("isSpaceToDelete");
+m.setAccessible(true);
+
+Assert.assertFalse((boolean) m.invoke(cleanCommitLogService));
+} finally {
+messageStore.shutdown();
--- End diff --

How about putting the finally block into teardown() ?
The test framework will handle it.


---


[GitHub] incubator-rocketmq pull request #133: [ROCKETMQ-249] Do not attempt to clear...

2017-08-13 Thread solosky
Github user solosky commented on a diff in the pull request:

https://github.com/apache/incubator-rocketmq/pull/133#discussion_r132864458
  
--- Diff: common/src/main/java/org/apache/rocketmq/common/UtilAll.java ---
@@ -184,15 +184,27 @@ public static String timeMillisToHumanString3(final 
long t) {
 cal.get(Calendar.SECOND));
 }
 
+/**
+ * Estimates the disk usage percentage by the specified path.
+ *
+ * @param path Path.
+ * @return Disk usage percentage by path.
+ */
 public static double getDiskPartitionSpaceUsedPercent(final String 
path) {
-if (null == path || path.isEmpty())
+if (null == path || path.isEmpty()) {
--- End diff --

we should use StringUtils.isBlank(..) instead as a basic practice. 


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---