diff --git a/config/src/main/java/com/alibaba/nacos/config/server/constant/Constants.java b/config/src/main/java/com/alibaba/nacos/config/server/constant/Constants.java index ad765cd18a0..24e15122a8d 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/constant/Constants.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/constant/Constants.java @@ -275,4 +275,7 @@ public class Constants { public static final String CONFIG_EXPORT_METADATA = ".meta.yml"; public static final String CONFIG_EXPORT_METADATA_NEW = ".metadata.yml"; + + public static final String DERBY_PATH_NAME = "derby-data"; + } diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/datasource/LocalDataSourceServiceImpl.java b/config/src/main/java/com/alibaba/nacos/config/server/service/datasource/LocalDataSourceServiceImpl.java index c6c373ccd90..853cea7ab8d 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/datasource/LocalDataSourceServiceImpl.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/datasource/LocalDataSourceServiceImpl.java @@ -57,7 +57,7 @@ public class LocalDataSourceServiceImpl implements DataSourceService { private final String password = "nacos"; - private final String derbyBaseDir = "data" + File.separator + "derby-data"; + private final String derbyBaseDir = "data" + File.separator + Constants.DERBY_PATH_NAME; private final String derbyShutdownErrMsg = "Derby system shutdown."; diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/DerbySnapshotOperation.java b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/DerbySnapshotOperation.java index 4575b6c7e45..adb6fc9d30f 100644 --- a/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/DerbySnapshotOperation.java +++ b/config/src/main/java/com/alibaba/nacos/config/server/service/repository/embedded/DerbySnapshotOperation.java @@ -17,6 +17,7 @@ package com.alibaba.nacos.config.server.service.repository.embedded; import com.alibaba.nacos.common.notify.NotifyCenter; +import com.alibaba.nacos.config.server.constant.Constants; import com.alibaba.nacos.config.server.model.event.DerbyLoadEvent; import com.alibaba.nacos.config.server.service.datasource.DataSourceService; import com.alibaba.nacos.config.server.service.datasource.DynamicDataSource; @@ -61,7 +62,7 @@ public class DerbySnapshotOperation implements SnapshotOperation { private final String snapshotArchive = "derby_data.zip"; - private final String derbyBaseDir = Paths.get(EnvUtil.getNacosHome(), "data", "derby-data").toString(); + private final String derbyBaseDir = Paths.get(EnvUtil.getNacosHome(), "data", Constants.DERBY_PATH_NAME).toString(); private final String restoreDB = "jdbc:derby:" + derbyBaseDir; @@ -127,7 +128,7 @@ public boolean onSnapshotLoad(Reader reader) { } } - final String loadPath = Paths.get(readerPath, snapshotDir, "derby-data").toString(); + final String loadPath = Paths.get(readerPath, snapshotDir, Constants.DERBY_PATH_NAME).toString(); LogUtil.FATAL_LOG.info("snapshot load from : {}, and copy to : {}", loadPath, derbyBaseDir); doDerbyRestoreFromBackup(() -> {