Skip to content

Fix monitor bug caused by virtual storage group name #2852

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.

Sign up for GitHub

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

Merged
jixuan1989 merged 7 commits into from
Apr 1, 2021
Merged

Fix monitor bug caused by virtual storage group name #2852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
186e55f
fix monitor bug
SilverNarcissus Mar 16, 2021
691c0ce
add test
SilverNarcissus Mar 16, 2021
6b5d917
fix format
SilverNarcissus Mar 16, 2021
c896fcf
fix format
SilverNarcissus Mar 17, 2021
8c3efce
fix bug
SilverNarcissus Mar 25, 2021
bd6c41f
add log to find
SilverNarcissus Mar 26, 2021
c71763f
fix bug
SilverNarcissus Mar 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@

import java.util.concurrent.ConcurrentLinkedDeque;

import static java.io.File.separator;

public class FlushManager implements FlushManagerMBean, IService {

private static final Logger LOGGER = LoggerFactory.getLogger(FlushManager.class);
Expand Down Expand Up @@ -110,7 +112,8 @@ public void runMayThrow() {
// update stat monitor cache to system during each flush()
if (config.isEnableStatMonitor() && config.isEnableMonitorSeriesWrite()) {
try {
StatMonitor.getInstance().saveStatValue(tsFileProcessor.getStorageGroupName());
StatMonitor.getInstance()
.saveStatValue(tsFileProcessor.getStorageGroupName().split(separator)[0]);
} catch (StorageEngineException | MetadataException e) {
LOGGER.error("Inserting monitor series data error.", e);
}
Expand Down
2 changes: 2 additions & 0 deletions server/src/main/java/org/apache/iotdb/db/monitor/StatMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.service.JMXService;
import org.apache.iotdb.db.service.ServiceType;
import org.apache.iotdb.db.utils.TestOnly;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
Expand Down Expand Up @@ -204,6 +205,7 @@ public void updateFailedStatValue() {
globalSeriesValue.set(2, globalSeriesValue.get(2) + 1);
}

@TestOnly
public void close() {
config.setEnableStatMonitor(false);
config.setEnableMonitorSeriesWrite(false);
Expand Down
6 changes: 4 additions & 2 deletions server/src/test/java/org/apache/iotdb/db/monitor/IoTDBStatMonitorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,17 @@ public void setUp() throws Exception {
@After
public void tearDown() throws IOException, StorageEngineException {
// reset setEnableStatMonitor to false
config.setEnableStatMonitor(false);
config.setEnableMonitorSeriesWrite(false);

statMonitor.close();
EnvironmentUtils.cleanEnv();
}

@Test
public void completeTest() throws Exception {
getValueInMemoryTest();
statMonitor.saveStatValue("root.sg");
saveStatValueTest();

// restart server
Expand Down Expand Up @@ -113,8 +117,6 @@ private void getValueInMemoryTest() {
}

private void saveStatValueTest() throws MetadataException, StorageEngineException {
statMonitor.saveStatValue(STORAGE_GROUP_NAME);

try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Expand Down