You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/12/24 07:15:13 UTC
[shardingsphere] branch master updated: Add
FileSystemResumeBreakPointManager (#8745)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 4eeba64 Add FileSystemResumeBreakPointManager (#8745)
4eeba64 is described below
commit 4eeba649a7020fd54f5ddcedb2691504ad85df06
Author: 邱鹿 Lucas <lu...@163.com>
AuthorDate: Thu Dec 24 15:14:46 2020 +0800
Add FileSystemResumeBreakPointManager (#8745)
* Add FileSystemResumeBreakPointManager
* Update FileSystemResumeBreakPointManager root path.
* Update FileSystemResumeBreakPointManager root path.
* Optimize FileSystemResumeBreakPointManager
* Optimize FileSystemResumeBreakPointManager
Co-authored-by: qiulu3 <Lucas209910>
---
pom.xml | 1 +
.../scaling/fixture/FixtureH2ScalingEntry.java | 2 +-
.../scaling/fixture/FixturePositionManager.java} | 25 +++--
.../fixture/FixtureResumeBreakPointManager.java} | 21 ++--
.../scaling/web/HttpServerHandlerTest.java | 11 +++
.../shardingsphere-scaling-core/pom.xml | 6 ++
.../core/job/position/InventoryPositionGroup.java | 8 +-
.../resume/AbstractResumeBreakPointManager.java | 86 ++++++++++++----
.../resume/FileSystemResumeBreakPointManager.java | 51 ++++++++++
...RegistryRepositoryResumeBreakPointManager.java} | 32 +++---
.../resume/RepositoryResumeBreakPointManager.java | 89 -----------------
.../position/resume/ResumeBreakPointManager.java | 19 +++-
.../resume/ResumeBreakPointManagerFactory.java | 4 +-
.../preparer/resumer/ScalingPositionResumer.java | 15 +--
.../AbstractResumeBreakPointManagerTest.java | 110 +++++++++------------
.../FileSystemResumeBreakPointManagerTest.java | 54 ++++++++++
...stryRepositoryResumeBreakPointManagerTest.java} | 38 +++----
.../resumer/ScalingPositionResumerTest.java | 3 +-
.../impl/StandaloneScalingJobServiceTest.java | 15 ---
19 files changed, 312 insertions(+), 278 deletions(-)
diff --git a/pom.xml b/pom.xml
index f4ad1b6..19acb34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,7 @@
<elasticjob.version>3.0.0-beta</elasticjob.version>
<calcite.version>1.26.0</calcite.version>
+ <commons-io.version>2.8.0</commons-io.version>
<!-- Plugin versions -->
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
diff --git a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/fixture/FixtureH2ScalingEntry.java b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/fixture/FixtureH2ScalingEntry.java
index bd86ae5..478558b 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/fixture/FixtureH2ScalingEntry.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/fixture/FixtureH2ScalingEntry.java
@@ -40,7 +40,7 @@ public final class FixtureH2ScalingEntry implements ScalingEntry {
@Override
public Class<? extends PositionManager> getPositionManager() {
- return PositionManager.class;
+ return FixturePositionManager.class;
}
@Override
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/FakeResumeBreakPointManager.java b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/fixture/FixturePositionManager.java
similarity index 61%
copy from shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/FakeResumeBreakPointManager.java
copy to shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/fixture/FixturePositionManager.java
index 7877f00..ac69629 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/FakeResumeBreakPointManager.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/fixture/FixturePositionManager.java
@@ -15,23 +15,20 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.scaling.core.job.position.resume;
+package org.apache.shardingsphere.scaling.fixture;
-/**
- * Fake resume from break-point manager as default.
- */
-public final class FakeResumeBreakPointManager extends AbstractResumeBreakPointManager {
-
- public FakeResumeBreakPointManager(final String databaseType, final String taskPath) {
- setDatabaseType(databaseType);
- setTaskPath(taskPath);
- }
+import org.apache.shardingsphere.scaling.core.job.position.PlaceholderPosition;
+import org.apache.shardingsphere.scaling.core.job.position.PositionManager;
+
+import javax.sql.DataSource;
+
+public final class FixturePositionManager extends PositionManager {
- @Override
- public void persistInventoryPosition() {
+ public FixturePositionManager(final DataSource dataSource) {
+ super(new PlaceholderPosition());
}
- @Override
- public void persistIncrementalPosition() {
+ public FixturePositionManager(final String position) {
+ super(new PlaceholderPosition());
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/FakeResumeBreakPointManager.java b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/fixture/FixtureResumeBreakPointManager.java
similarity index 57%
rename from shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/FakeResumeBreakPointManager.java
rename to shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/fixture/FixtureResumeBreakPointManager.java
index 7877f00..2233312 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/FakeResumeBreakPointManager.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/fixture/FixtureResumeBreakPointManager.java
@@ -15,23 +15,24 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.scaling.core.job.position.resume;
+package org.apache.shardingsphere.scaling.fixture;
-/**
- * Fake resume from break-point manager as default.
- */
-public final class FakeResumeBreakPointManager extends AbstractResumeBreakPointManager {
+import org.apache.shardingsphere.scaling.core.job.position.resume.AbstractResumeBreakPointManager;
+import org.apache.shardingsphere.scaling.core.job.position.resume.ResumeBreakPointManager;
+
+public final class FixtureResumeBreakPointManager extends AbstractResumeBreakPointManager implements ResumeBreakPointManager {
- public FakeResumeBreakPointManager(final String databaseType, final String taskPath) {
- setDatabaseType(databaseType);
- setTaskPath(taskPath);
+ public FixtureResumeBreakPointManager(final String databaseType, final String taskPath) {
+ super(databaseType, taskPath);
}
@Override
- public void persistInventoryPosition() {
+ public String getPosition(final String path) {
+ return null;
}
@Override
- public void persistIncrementalPosition() {
+ public void persistPosition(final String path, final String data) {
+
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java
index 4f60b9e..60abb85 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/test/java/org/apache/shardingsphere/scaling/web/HttpServerHandlerTest.java
@@ -32,8 +32,12 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.scaling.core.config.ScalingContext;
import org.apache.shardingsphere.scaling.core.config.ServerConfiguration;
import org.apache.shardingsphere.scaling.core.execute.engine.TaskExecuteEngine;
+import org.apache.shardingsphere.scaling.core.job.position.resume.FileSystemResumeBreakPointManager;
+import org.apache.shardingsphere.scaling.core.job.position.resume.ResumeBreakPointManagerFactory;
import org.apache.shardingsphere.scaling.core.utils.ReflectionUtil;
+import org.apache.shardingsphere.scaling.fixture.FixtureResumeBreakPointManager;
import org.apache.shardingsphere.scaling.util.ScalingConfigurationUtil;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -63,6 +67,7 @@ public final class HttpServerHandlerTest {
public void setUp() {
ReflectionUtil.setFieldValue(ScalingContext.getInstance(), "serverConfig", new ServerConfiguration());
ReflectionUtil.setFieldValue(ScalingContext.getInstance(), "inventoryDumperExecuteEngine", mock(TaskExecuteEngine.class));
+ ReflectionUtil.setStaticFieldValue(ResumeBreakPointManagerFactory.class, "clazz", FixtureResumeBreakPointManager.class);
httpServerHandler = new HttpServerHandler();
}
@@ -185,4 +190,10 @@ public final class HttpServerHandlerTest {
JsonObject jsonObject = new Gson().fromJson(fullHttpResponse.content().toString(CharsetUtil.UTF_8), JsonObject.class);
return jsonObject.get("model").getAsJsonObject().get("jobId").getAsLong();
}
+
+ @After
+ @SneakyThrows(ReflectiveOperationException.class)
+ public void tearDown() {
+ ReflectionUtil.setStaticFieldValue(ResumeBreakPointManagerFactory.class, "clazz", FileSystemResumeBreakPointManager.class);
+ }
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/pom.xml b/shardingsphere-scaling/shardingsphere-scaling-core/pom.xml
index 90dbe30..6ce1cd6 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/pom.xml
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/pom.xml
@@ -65,6 +65,12 @@
<artifactId>gson</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/InventoryPositionGroup.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/InventoryPositionGroup.java
index 2a8b5b9..75092f7 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/InventoryPositionGroup.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/InventoryPositionGroup.java
@@ -17,13 +17,14 @@
package org.apache.shardingsphere.scaling.core.job.position;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.TypeAdapter;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import lombok.Getter;
-import lombok.Setter;
import java.io.IOException;
import java.util.Map;
@@ -33,14 +34,13 @@ import java.util.Set;
* Inventory position group.
*/
@Getter
-@Setter
public final class InventoryPositionGroup {
private static final Gson GSON = new GsonBuilder().registerTypeHierarchyAdapter(Position.class, new PositionTypeAdapter()).create();
- private Map<String, Position<?>> unfinished;
+ private final Map<String, Position<?>> unfinished = Maps.newHashMap();
- private Set<String> finished;
+ private final Set<String> finished = Sets.newHashSet();
/**
* init {@code InventoryPositionGroup} from json.
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/AbstractResumeBreakPointManager.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/AbstractResumeBreakPointManager.java
index 1b31e0d..8b71ecb 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/AbstractResumeBreakPointManager.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/AbstractResumeBreakPointManager.java
@@ -19,11 +19,10 @@ package org.apache.shardingsphere.scaling.core.job.position.resume;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
import com.google.gson.Gson;
import lombok.Getter;
-import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
+import org.apache.shardingsphere.scaling.core.constant.ScalingConstant;
import org.apache.shardingsphere.scaling.core.job.position.FinishedPosition;
import org.apache.shardingsphere.scaling.core.job.position.InventoryPositionGroup;
import org.apache.shardingsphere.scaling.core.job.position.Position;
@@ -33,29 +32,57 @@ import org.apache.shardingsphere.scaling.core.job.position.PositionManagerFactor
import java.io.Closeable;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
* Abstract resume from break-point manager.
*/
-@Getter
-@Setter
@Slf4j
public abstract class AbstractResumeBreakPointManager implements ResumeBreakPointManager, Closeable {
private static final Gson GSON = new Gson();
+ @Getter
private final Map<String, PositionManager> inventoryPositionManagerMap = Maps.newConcurrentMap();
+ @Getter
private final Map<String, PositionManager> incrementalPositionManagerMap = Maps.newConcurrentMap();
+ @Getter
private boolean resumable;
- private String databaseType;
+ private final String databaseType;
- private String taskPath;
+ private final String taskPath;
- protected final void resumeInventoryPosition(final String data) {
+ private final ScheduledExecutorService executor;
+
+ public AbstractResumeBreakPointManager(final String databaseType, final String taskPath) {
+ this.databaseType = databaseType;
+ this.taskPath = taskPath;
+ resumePosition();
+ executor = Executors.newSingleThreadScheduledExecutor();
+ executor.scheduleWithFixedDelay(this::persistPosition, 1, 1, TimeUnit.MINUTES);
+ }
+
+ private void resumePosition() {
+ try {
+ resumeInventoryPosition(getInventoryPath());
+ resumeIncrementalPosition(getIncrementalPath());
+ resumable = !inventoryPositionManagerMap.isEmpty() && !incrementalPositionManagerMap.isEmpty();
+ // CHECKSTYLE:OFF
+ } catch (final Exception ex) {
+ // CHECKSTYLE:ON
+ log.error("resume position failed.");
+ throw ex;
+ }
+ }
+
+ protected void resumeInventoryPosition(final String path) {
+ String data = getPosition(path);
if (Strings.isNullOrEmpty(data)) {
return;
}
@@ -70,7 +97,8 @@ public abstract class AbstractResumeBreakPointManager implements ResumeBreakPoin
}
}
- protected final void resumeIncrementalPosition(final String data) {
+ protected void resumeIncrementalPosition(final String path) {
+ String data = getPosition(path);
if (Strings.isNullOrEmpty(data)) {
return;
}
@@ -81,25 +109,49 @@ public abstract class AbstractResumeBreakPointManager implements ResumeBreakPoin
}
}
- protected final String getInventoryPositionData() {
- InventoryPositionGroup result = new InventoryPositionGroup();
- result.setUnfinished(Maps.newHashMap());
- result.setFinished(Sets.newHashSet());
+ @Override
+ public void persistPosition() {
+ try {
+ persistIncrementalPosition();
+ persistInventoryPosition();
+ // CHECKSTYLE:OFF
+ } catch (final Exception ex) {
+ // CHECKSTYLE:ON
+ log.error("persist position failed.", ex);
+ }
+ }
+
+ private void persistInventoryPosition() {
+ InventoryPositionGroup inventoryPositionGroup = new InventoryPositionGroup();
for (Entry<String, PositionManager> entry : inventoryPositionManagerMap.entrySet()) {
if (entry.getValue().getPosition() instanceof FinishedPosition) {
- result.getFinished().add(entry.getKey());
+ inventoryPositionGroup.getFinished().add(entry.getKey());
continue;
}
- result.getUnfinished().put(entry.getKey(), entry.getValue().getPosition());
+ inventoryPositionGroup.getUnfinished().put(entry.getKey(), entry.getValue().getPosition());
}
- return result.toJson();
+ String data = inventoryPositionGroup.toJson();
+ log.info("persist inventory position {} = {}", getInventoryPath(), data);
+ persistPosition(getInventoryPath(), data);
+ }
+
+ private void persistIncrementalPosition() {
+ String data = GSON.toJson(incrementalPositionManagerMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().getPosition())));
+ log.info("persist incremental position {} = {}", getIncrementalPath(), data);
+ persistPosition(getIncrementalPath(), data);
+ }
+
+ protected String getInventoryPath() {
+ return String.format("%s/%s", taskPath, ScalingConstant.INVENTORY);
}
- protected final String getIncrementalPositionData() {
- return GSON.toJson(incrementalPositionManagerMap.entrySet().stream().collect(Collectors.toMap(Entry::getKey, entry -> entry.getValue().getPosition())));
+ protected String getIncrementalPath() {
+ return String.format("%s/%s", taskPath, ScalingConstant.INCREMENTAL);
}
@Override
public void close() {
+ executor.submit((Runnable) this::persistPosition);
+ executor.shutdown();
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/FileSystemResumeBreakPointManager.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/FileSystemResumeBreakPointManager.java
new file mode 100644
index 0000000..1daac29
--- /dev/null
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/FileSystemResumeBreakPointManager.java
@@ -0,0 +1,51 @@
+/*
+ * 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.shardingsphere.scaling.core.job.position.resume;
+
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * File system resume from break-point manager as default.
+ */
+public final class FileSystemResumeBreakPointManager extends AbstractResumeBreakPointManager implements ResumeBreakPointManager {
+
+ public FileSystemResumeBreakPointManager(final String databaseType, final String taskPath) {
+ super(databaseType, taskPath.startsWith("/") ? ".scaling/" + taskPath : taskPath);
+ }
+
+ @Override
+ @SneakyThrows(IOException.class)
+ public String getPosition(final String path) {
+ File file = new File(path);
+ if (!file.exists()) {
+ return null;
+ }
+ return FileUtils.readFileToString(file, StandardCharsets.UTF_8);
+ }
+
+ @Override
+ @SneakyThrows(IOException.class)
+ public void persistPosition(final String path, final String data) {
+ FileUtils.writeStringToFile(new File(path), data, StandardCharsets.UTF_8);
+ }
+}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/IncrementalPositionResumeBreakPointManager.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/RegistryRepositoryResumeBreakPointManager.java
similarity index 53%
rename from shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/IncrementalPositionResumeBreakPointManager.java
rename to shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/RegistryRepositoryResumeBreakPointManager.java
index b5cd7d5..91fedb6 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/IncrementalPositionResumeBreakPointManager.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/RegistryRepositoryResumeBreakPointManager.java
@@ -17,33 +17,27 @@
package org.apache.shardingsphere.scaling.core.job.position.resume;
-import org.apache.shardingsphere.scaling.core.job.position.PlaceholderPosition;
-import org.apache.shardingsphere.scaling.core.job.position.PositionManager;
+import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
+import org.apache.shardingsphere.scaling.core.service.RegistryRepositoryHolder;
-import java.util.HashMap;
-import java.util.Map;
-
-public final class IncrementalPositionResumeBreakPointManager extends AbstractResumeBreakPointManager {
+/**
+ * Registry repository resume from break-point manager.
+ */
+public final class RegistryRepositoryResumeBreakPointManager extends AbstractResumeBreakPointManager implements ResumeBreakPointManager {
- public IncrementalPositionResumeBreakPointManager(final String databaseType, final String taskPath) {
- getIncrementalPositionManagerMap().put("ds_0", new PositionManager(new PlaceholderPosition()));
- }
+ private static final RegistryRepository REGISTRY_REPOSITORY = RegistryRepositoryHolder.getInstance();
- @Override
- public boolean isResumable() {
- return true;
- }
-
- @Override
- public Map<String, PositionManager> getInventoryPositionManagerMap() {
- return new HashMap<>(1, 1);
+ public RegistryRepositoryResumeBreakPointManager(final String databaseType, final String taskPath) {
+ super(databaseType, taskPath);
}
@Override
- public void persistInventoryPosition() {
+ public String getPosition(final String path) {
+ return REGISTRY_REPOSITORY.get(path);
}
@Override
- public void persistIncrementalPosition() {
+ public void persistPosition(final String path, final String data) {
+ REGISTRY_REPOSITORY.persist(path, data);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/RepositoryResumeBreakPointManager.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/RepositoryResumeBreakPointManager.java
deleted file mode 100644
index 462a207..0000000
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/RepositoryResumeBreakPointManager.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.shardingsphere.scaling.core.job.position.resume;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
-import org.apache.shardingsphere.scaling.core.constant.ScalingConstant;
-import org.apache.shardingsphere.scaling.core.service.RegistryRepositoryHolder;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Repository resume from break-point manager.
- */
-@Slf4j
-public final class RepositoryResumeBreakPointManager extends AbstractResumeBreakPointManager {
-
- private static final RegistryRepository REGISTRY_REPOSITORY = RegistryRepositoryHolder.getInstance();
-
- private final ScheduledExecutorService executor;
-
- private final String inventoryPath;
-
- private final String incrementalPath;
-
- public RepositoryResumeBreakPointManager(final String databaseType, final String taskPath) {
- setDatabaseType(databaseType);
- setTaskPath(taskPath);
- inventoryPath = String.format("%s/%s", taskPath, ScalingConstant.INVENTORY);
- incrementalPath = String.format("%s/%s", taskPath, ScalingConstant.INCREMENTAL);
- resumePosition();
- setResumable(!getInventoryPositionManagerMap().isEmpty() && !getIncrementalPositionManagerMap().isEmpty());
- executor = Executors.newSingleThreadScheduledExecutor();
- executor.scheduleWithFixedDelay(this::persistPosition, 1, 1, TimeUnit.MINUTES);
- }
-
- private void resumePosition() {
- resumeInventoryPosition(REGISTRY_REPOSITORY.get(inventoryPath));
- resumeIncrementalPosition(REGISTRY_REPOSITORY.get(incrementalPath));
- }
-
- private void persistPosition() {
- try {
- persistIncrementalPosition();
- persistInventoryPosition();
- // CHECKSTYLE:OFF
- } catch (final Exception ex) {
- // CHECKSTYLE:ON
- log.error("persist position failed.", ex);
- }
- }
-
- @Override
- public void persistInventoryPosition() {
- String result = getInventoryPositionData();
- REGISTRY_REPOSITORY.persist(inventoryPath, result);
- log.info("persist inventory position {} = {}", inventoryPath, result);
- }
-
- @Override
- public void persistIncrementalPosition() {
- String result = getIncrementalPositionData();
- REGISTRY_REPOSITORY.persist(incrementalPath, result);
- log.info("persist incremental position {} = {}", incrementalPath, result);
- }
-
- @Override
- public void close() {
- executor.submit(this::persistPosition);
- executor.shutdown();
- }
-}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ResumeBreakPointManager.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ResumeBreakPointManager.java
index de794ab..d52f78e 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ResumeBreakPointManager.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ResumeBreakPointManager.java
@@ -48,14 +48,25 @@ public interface ResumeBreakPointManager {
Map<String, PositionManager> getIncrementalPositionManagerMap();
/**
- * Persist inventory position.
+ * Get position.
+ *
+ * @param path path
+ * @return data
*/
- void persistInventoryPosition();
+ String getPosition(String path);
/**
- * Persist incremental position.
+ * Persist position immediately.
+ */
+ void persistPosition();
+
+ /**
+ * Persist position.
+ *
+ * @param path path
+ * @param data data
*/
- void persistIncrementalPosition();
+ void persistPosition(String path, String data);
/**
* Close this manager.
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ResumeBreakPointManagerFactory.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ResumeBreakPointManagerFactory.java
index 5bd517e..efcd723 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ResumeBreakPointManagerFactory.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ResumeBreakPointManagerFactory.java
@@ -31,13 +31,13 @@ import org.apache.shardingsphere.scaling.core.service.RegistryRepositoryHolder;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ResumeBreakPointManagerFactory {
- private static Class<? extends ResumeBreakPointManager> clazz = FakeResumeBreakPointManager.class;
+ private static Class<? extends ResumeBreakPointManager> clazz = FileSystemResumeBreakPointManager.class;
static {
ShardingSphereServiceLoader.register(RegistryRepository.class);
ShardingSphereServiceLoader.register(ConfigurationRepository.class);
if (RegistryRepositoryHolder.isAvailable()) {
- clazz = RepositoryResumeBreakPointManager.class;
+ clazz = RegistryRepositoryResumeBreakPointManager.class;
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/ScalingPositionResumer.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/ScalingPositionResumer.java
index 507cf22..ef9cb5a 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/ScalingPositionResumer.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/ScalingPositionResumer.java
@@ -105,21 +105,12 @@ public final class ScalingPositionResumer {
* @param resumeBreakPointManager resume from break-point manager
*/
public void persistPosition(final ScalingJob scalingJob, final ResumeBreakPointManager resumeBreakPointManager) {
- persistIncrementalPosition(scalingJob.getIncrementalTasks(), resumeBreakPointManager);
- persistInventoryPosition(scalingJob.getInventoryTasks(), resumeBreakPointManager);
- }
-
- private void persistInventoryPosition(final List<ScalingTask> inventoryTasks, final ResumeBreakPointManager resumeBreakPointManager) {
- for (ScalingTask each : inventoryTasks) {
+ for (ScalingTask each : scalingJob.getInventoryTasks()) {
resumeBreakPointManager.getInventoryPositionManagerMap().put(each.getTaskId(), each.getPositionManager());
}
- resumeBreakPointManager.persistInventoryPosition();
- }
-
- private void persistIncrementalPosition(final List<ScalingTask> incrementalTasks, final ResumeBreakPointManager resumeBreakPointManager) {
- for (ScalingTask each : incrementalTasks) {
+ for (ScalingTask each : scalingJob.getIncrementalTasks()) {
resumeBreakPointManager.getIncrementalPositionManagerMap().put(each.getTaskId(), each.getPositionManager());
}
- resumeBreakPointManager.persistIncrementalPosition();
+ resumeBreakPointManager.persistPosition();
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/AbstractResumeBreakPointManagerTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/AbstractResumeBreakPointManagerTest.java
index 3b5f196..e06bbbb 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/AbstractResumeBreakPointManagerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/AbstractResumeBreakPointManagerTest.java
@@ -17,15 +17,17 @@
package org.apache.shardingsphere.scaling.core.job.position.resume;
+import lombok.SneakyThrows;
import org.apache.shardingsphere.scaling.core.job.position.FinishedPosition;
import org.apache.shardingsphere.scaling.core.job.position.PlaceholderPosition;
import org.apache.shardingsphere.scaling.core.job.position.PositionManager;
import org.apache.shardingsphere.scaling.core.job.position.PrimaryKeyPosition;
import org.apache.shardingsphere.scaling.core.utils.ReflectionUtil;
import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
+import java.util.HashMap;
+import java.util.Map;
import java.util.TreeMap;
import static org.hamcrest.CoreMatchers.is;
@@ -35,90 +37,68 @@ public final class AbstractResumeBreakPointManagerTest {
private AbstractResumeBreakPointManager resumeBreakPointManager;
- private final String incrementalPosition = "{\"ds0\":[],\"ds1\":[]}";
-
- private final String inventoryPosition = "{\"unfinished\":{\"ds1.t_order_1#0\":[0,200],\"ds0.t_order_1#0\":[0,100],\"ds0.t_order_2\":[]},\"finished\":[\"ds0.t_order_1#1\"]}";
-
- @Before
- public void setUp() throws NoSuchFieldException, IllegalAccessException {
- resumeBreakPointManager = new AbstractResumeBreakPointManager() {
-
- @Override
- public void persistInventoryPosition() {
- }
-
- @Override
- public void persistIncrementalPosition() {
- }
- };
- resumeBreakPointManager.setDatabaseType("H2");
- resumeBreakPointManager.setTaskPath("/");
- setPositionManagerMap("inventoryPositionManagerMap");
- setPositionManagerMap("incrementalPositionManagerMap");
- }
-
- private void setPositionManagerMap(final String inventoryPositionManagerMap) throws NoSuchFieldException, IllegalAccessException {
- ReflectionUtil.setFieldValue(AbstractResumeBreakPointManager.class, resumeBreakPointManager, inventoryPositionManagerMap, new TreeMap<String, PositionManager>());
- }
-
@Test
- public void assertResumeIncrementalPosition() {
+ public void assertResumeInventoryPosition() {
+ Map<String, String> dataMap = new HashMap<>();
+ dataMap.put("/base/inventory", "{\"unfinished\":{\"ds1.t_order_1#0\":[0,200],\"ds0.t_order_1#0\":[0,100],\"ds0.t_order_2\":[]},\"finished\":[\"ds0.t_order_1#1\"]}");
+ resumeBreakPointManager = mockResumeBreakPointManager(dataMap);
resumeBreakPointManager.resumeInventoryPosition("");
assertThat(resumeBreakPointManager.getInventoryPositionManagerMap().size(), is(0));
- resumeBreakPointManager.resumeInventoryPosition(inventoryPosition);
+ resumeBreakPointManager.resumeInventoryPosition("/base/inventory");
assertThat(resumeBreakPointManager.getInventoryPositionManagerMap().size(), is(4));
}
@Test
- public void assertResumeInventoryPosition() {
+ public void assertResumeIncrementalPosition() {
+ Map<String, String> dataMap = new HashMap<>();
+ dataMap.put("/base/incremental", "{\"ds0\":[],\"ds1\":[]}");
+ resumeBreakPointManager = mockResumeBreakPointManager(dataMap);
resumeBreakPointManager.resumeIncrementalPosition("");
assertThat(resumeBreakPointManager.getIncrementalPositionManagerMap().size(), is(0));
- resumeBreakPointManager.resumeIncrementalPosition(incrementalPosition);
+ resumeBreakPointManager.resumeIncrementalPosition("/base/incremental");
assertThat(resumeBreakPointManager.getIncrementalPositionManagerMap().size(), is(2));
}
@Test
- public void assertGetIncrementalPositionData() {
- resumeBreakPointManager.getIncrementalPositionManagerMap().put("ds0", new PositionManager(new PlaceholderPosition()));
- resumeBreakPointManager.getIncrementalPositionManagerMap().put("ds1", new PositionManager(new PlaceholderPosition()));
- assertThat(resumeBreakPointManager.getIncrementalPositionData(), is(incrementalPosition));
- }
-
- @Test
- public void assertPrimaryKeyPositionJson() {
- resumeBreakPointManager.getInventoryPositionManagerMap().put("ds0.t_order_1#0", new PositionManager(new PrimaryKeyPosition(0L, 100L)));
- assertThat(resumeBreakPointManager.getInventoryPositionData(), is("{\"unfinished\":{\"ds0.t_order_1#0\":[0,100]},\"finished\":[]}"));
- }
-
- @Test
- public void assertPlaceholderPositionJson() {
- resumeBreakPointManager.getInventoryPositionManagerMap().put("ds0.t_order_1#0", new PositionManager(new PlaceholderPosition()));
- assertThat(resumeBreakPointManager.getInventoryPositionData(), is("{\"unfinished\":{\"ds0.t_order_1#0\":[]},\"finished\":[]}"));
- }
-
- @Test
- public void assertFinishedPositionJson() {
- resumeBreakPointManager.getInventoryPositionManagerMap().put("ds0.t_order_1#0", new PositionManager(new FinishedPosition()));
- assertThat(resumeBreakPointManager.getInventoryPositionData(), is("{\"unfinished\":{},\"finished\":[\"ds0.t_order_1#0\"]}"));
- }
-
- @Test
- public void assertGetInventoryPositionData() {
+ public void assertPersistInventoryPosition() {
+ Map<String, String> dataMap = new HashMap<>();
+ dataMap.put("/base/inventory", "{\"unfinished\":{\"ds0.t_order_2#0\":[],\"ds0.t_order_1#0\":[0,100]},\"finished\":[\"ds0.t_order_1#1\"]}");
+ dataMap.put("/base/incremental", "{}");
+ resumeBreakPointManager = mockResumeBreakPointManager(dataMap);
resumeBreakPointManager.getInventoryPositionManagerMap().put("ds0.t_order_1#0", new PositionManager(new PrimaryKeyPosition(0L, 100L)));
resumeBreakPointManager.getInventoryPositionManagerMap().put("ds0.t_order_1#1", new PositionManager(new FinishedPosition()));
- resumeBreakPointManager.getInventoryPositionManagerMap().put("ds0.t_order_2", new PositionManager(new PlaceholderPosition()));
- resumeBreakPointManager.getInventoryPositionManagerMap().put("ds1.t_order_1#0", new PositionManager(new PrimaryKeyPosition(0L, 200L)));
- assertThat(resumeBreakPointManager.getInventoryPositionData(), is(inventoryPosition));
+ resumeBreakPointManager.getInventoryPositionManagerMap().put("ds0.t_order_2#0", new PositionManager(new PlaceholderPosition()));
+ resumeBreakPointManager.persistPosition();
}
@Test
- public void assertGetDatabaseType() {
- assertThat(resumeBreakPointManager.getDatabaseType(), is("H2"));
+ public void assertPersistIncrementalPosition() {
+ Map<String, String> dataMap = new HashMap<>();
+ dataMap.put("/base/inventory", "{\"unfinished\":{},\"finished\":[]}");
+ dataMap.put("/base/incremental", "{\"ds0\":[],\"ds1\":[]}");
+ resumeBreakPointManager = mockResumeBreakPointManager(dataMap);
+ resumeBreakPointManager.getIncrementalPositionManagerMap().put("ds0", new PositionManager(new PlaceholderPosition()));
+ resumeBreakPointManager.getIncrementalPositionManagerMap().put("ds1", new PositionManager(new PlaceholderPosition()));
+ resumeBreakPointManager.persistPosition();
}
- @Test
- public void assertGetTaskPath() {
- assertThat(resumeBreakPointManager.getTaskPath(), is("/"));
+ @SneakyThrows(ReflectiveOperationException.class)
+ private AbstractResumeBreakPointManager mockResumeBreakPointManager(final Map<String, String> dataMap) {
+ AbstractResumeBreakPointManager result = new AbstractResumeBreakPointManager("H2", "/base") {
+
+ @Override
+ public String getPosition(final String path) {
+ return dataMap.get(path);
+ }
+
+ @Override
+ public void persistPosition(final String path, final String data) {
+ assertThat(data, is(dataMap.get(path)));
+ }
+ };
+ ReflectionUtil.setFieldValue(AbstractResumeBreakPointManager.class, result, "inventoryPositionManagerMap", new TreeMap<String, PositionManager>());
+ ReflectionUtil.setFieldValue(AbstractResumeBreakPointManager.class, result, "incrementalPositionManagerMap", new TreeMap<String, PositionManager>());
+ return result;
}
@After
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/FileSystemResumeBreakPointManagerTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/FileSystemResumeBreakPointManagerTest.java
new file mode 100644
index 0000000..1a29ee9
--- /dev/null
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/FileSystemResumeBreakPointManagerTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.shardingsphere.scaling.core.job.position.resume;
+
+import lombok.SneakyThrows;
+import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+public final class FileSystemResumeBreakPointManagerTest {
+
+ private FileSystemResumeBreakPointManager resumeBreakPointManager;
+
+ @Before
+ public void setUp() {
+ resumeBreakPointManager = new FileSystemResumeBreakPointManager("H2", "target/.scaling");
+ }
+
+ @Test
+ public void assertPersistAndGetPosition() {
+ resumeBreakPointManager.persistPosition();
+ assertThat(resumeBreakPointManager.getPosition("target/.scaling/incremental"), is("{}"));
+ assertThat(resumeBreakPointManager.getPosition("target/.scaling/inventory"), is("{\"unfinished\":{},\"finished\":[]}"));
+ }
+
+ @After
+ @SneakyThrows(IOException.class)
+ public void tearDown() {
+ resumeBreakPointManager.close();
+ FileUtils.forceDeleteOnExit(new File("target/.scaling"));
+ }
+}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/RepositoryResumeBreakPointManagerTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/RegistryRepositoryResumeBreakPointManagerTest.java
similarity index 72%
rename from shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/RepositoryResumeBreakPointManagerTest.java
rename to shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/RegistryRepositoryResumeBreakPointManagerTest.java
index 1427b9a..156a1bc 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/RepositoryResumeBreakPointManagerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/position/resume/RegistryRepositoryResumeBreakPointManagerTest.java
@@ -31,36 +31,24 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public final class RepositoryResumeBreakPointManagerTest {
-
- private RepositoryResumeBreakPointManager repositoryResumeBreakPointManager;
-
+public final class RegistryRepositoryResumeBreakPointManagerTest {
+
+ private RegistryRepositoryResumeBreakPointManager resumeBreakPointManager;
+
@Before
public void setUp() {
ScalingContext.getInstance().init(mockServerConfiguration());
- repositoryResumeBreakPointManager = new RepositoryResumeBreakPointManager("H2", "/base");
+ resumeBreakPointManager = new RegistryRepositoryResumeBreakPointManager("H2", "/base");
}
-
- @Test
- public void assertPersistIncrementalPosition() {
- repositoryResumeBreakPointManager.persistIncrementalPosition();
- assertThat(RegistryRepositoryHolder.getInstance().get("/base/incremental"), is("{}"));
- }
-
+
@Test
- public void assertPersistInventoryPosition() {
- repositoryResumeBreakPointManager.persistInventoryPosition();
- assertThat(RegistryRepositoryHolder.getInstance().get("/base/inventory"), is("{\"unfinished\":{},\"finished\":[]}"));
- }
-
- @After
- public void tearDown() {
- repositoryResumeBreakPointManager.close();
- resetRegistryRepositoryAvailable();
+ public void assertPersistAndGetPosition() {
+ resumeBreakPointManager.persistPosition();
+ assertThat(resumeBreakPointManager.getPosition("/base/incremental"), is("{}"));
+ assertThat(resumeBreakPointManager.getPosition("/base/inventory"), is("{\"unfinished\":{},\"finished\":[]}"));
}
private ServerConfiguration mockServerConfiguration() {
- resetRegistryRepositoryAvailable();
YamlGovernanceConfiguration distributedScalingService = new YamlGovernanceConfiguration();
distributedScalingService.setName("test");
YamlGovernanceCenterConfiguration registryCenter = new YamlGovernanceCenterConfiguration();
@@ -71,9 +59,11 @@ public final class RepositoryResumeBreakPointManagerTest {
result.setDistributedScalingService(distributedScalingService);
return result;
}
-
+
+ @After
@SneakyThrows(ReflectiveOperationException.class)
- private void resetRegistryRepositoryAvailable() {
+ public void tearDown() {
+ resumeBreakPointManager.close();
ReflectionUtil.setStaticFieldValue(RegistryRepositoryHolder.class, "available", null);
}
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/ScalingPositionResumerTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/ScalingPositionResumerTest.java
index 60ee900..a8cd2bd 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/ScalingPositionResumerTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/job/preparer/resumer/ScalingPositionResumerTest.java
@@ -66,8 +66,7 @@ public final class ScalingPositionResumerTest {
public void assertPersistPosition() {
ResumeBreakPointManager resumeBreakPointManager = mock(ResumeBreakPointManager.class);
scalingPositionResumer.persistPosition(scalingJob, resumeBreakPointManager);
- verify(resumeBreakPointManager).persistIncrementalPosition();
- verify(resumeBreakPointManager).persistInventoryPosition();
+ verify(resumeBreakPointManager).persistPosition();
}
@SneakyThrows(IOException.class)
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/service/impl/StandaloneScalingJobServiceTest.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/service/impl/StandaloneScalingJobServiceTest.java
index 7240f51..a4e5bbb 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/service/impl/StandaloneScalingJobServiceTest.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/test/java/org/apache/shardingsphere/scaling/core/service/impl/StandaloneScalingJobServiceTest.java
@@ -26,9 +26,6 @@ import org.apache.shardingsphere.scaling.core.execute.engine.TaskExecuteEngine;
import org.apache.shardingsphere.scaling.core.job.JobProgress;
import org.apache.shardingsphere.scaling.core.job.ScalingJob;
import org.apache.shardingsphere.scaling.core.job.check.DataConsistencyCheckResult;
-import org.apache.shardingsphere.scaling.core.job.position.resume.FakeResumeBreakPointManager;
-import org.apache.shardingsphere.scaling.core.job.position.resume.IncrementalPositionResumeBreakPointManager;
-import org.apache.shardingsphere.scaling.core.job.position.resume.ResumeBreakPointManagerFactory;
import org.apache.shardingsphere.scaling.core.schedule.JobStatus;
import org.apache.shardingsphere.scaling.core.schedule.ScalingTaskScheduler;
import org.apache.shardingsphere.scaling.core.service.ScalingJobService;
@@ -107,18 +104,6 @@ public final class StandaloneScalingJobServiceTest {
}
@Test
- public void assertIncrementalTasksOnly() throws NoSuchFieldException, IllegalAccessException {
- ReflectionUtil.setStaticFieldValue(ResumeBreakPointManagerFactory.class, "clazz", IncrementalPositionResumeBreakPointManager.class);
- Optional<ScalingJob> scalingJob = scalingJobService.start(mockScalingConfiguration());
- assertTrue(scalingJob.isPresent());
- long jobId = scalingJob.get().getJobId();
- JobProgress progress = scalingJobService.getProgress(jobId);
- assertThat(progress.getIncrementalTaskProgress().size(), is(1));
- assertThat(progress.getInventoryTaskProgress().size(), is(1));
- ReflectionUtil.setStaticFieldValue(ResumeBreakPointManagerFactory.class, "clazz", FakeResumeBreakPointManager.class);
- }
-
- @Test
public void assertCheckExistJob() {
Optional<ScalingJob> scalingJobOptional = scalingJobService.start(mockScalingConfiguration());
assertTrue(scalingJobOptional.isPresent());