Skip to content

Commit 622f737

Browse files
committed
Replaces in memory bulk status with retrieval
The manager tracked the status of bulk imports in memory. This tracking would be lost when the manager restarted. Replaced this tracking with new code that retrieves the current status from persisted data. All the in memory tracking code was deleted. Deleted a shell command that relied on the old way of doing things and added a new admin command. This was done because the new way needs a server context which is not available in the shell. Updated the monitor to call the new code. The new code offers more information. Will open a follow on issue to display this additional information on the monitor. These changes were made in support of apache#6139. Anything the manager tracks in memory makes it harder to split the manager into multiple processes.
1 parent 8c4ddb3 commit 622f737

32 files changed

Lines changed: 492 additions & 1467 deletions

File tree

server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TraceRepo.java renamed to core/src/main/java/org/apache/accumulo/core/fate/TraceRepo.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.apache.accumulo.manager.tableOps;
19+
package org.apache.accumulo.core.fate;
2020

2121
import org.apache.accumulo.core.clientImpl.thrift.TInfo;
22-
import org.apache.accumulo.core.fate.FateId;
23-
import org.apache.accumulo.core.fate.Repo;
2422
import org.apache.accumulo.core.trace.TraceUtil;
2523

2624
import io.opentelemetry.api.trace.Span;
@@ -107,12 +105,16 @@ public String getReturn() {
107105
return repo.getReturn();
108106
}
109107

108+
public Repo<T> getWrapped() {
109+
return repo;
110+
}
111+
110112
/**
111113
* @return string version of Repo that is suitable for logging
112114
*/
113-
public static String toLogString(Repo<FateEnv> repo) {
115+
public static <T2> String toLogString(Repo<T2> repo) {
114116
if (repo instanceof TraceRepo) {
115-
repo = ((TraceRepo<FateEnv>) repo).repo;
117+
repo = ((TraceRepo<T2>) repo).repo;
116118
}
117119

118120
return repo.getClass() + " " + repo.getName();

core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/BulkImportState.java

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)