Skip to content
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

Memory optimize at log manager. #629

Merged
merged 8 commits into from
Jul 1, 2021
Merged

Memory optimize at log manager. #629

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9b15d85
memory optimize at log manager.
horizonzy Jun 28, 2021
d3887f3
memory optimize at node impl
horizonzy Jun 28, 2021
ec6d03b
memory optimize at fsm caller impl.
horizonzy Jun 28, 2021
067136a
modify the node impl memory optimize way.
horizonzy Jun 28, 2021
336970f
memory optimize at message event.
horizonzy Jun 28, 2021
356dae0
code clean, make reset operation at current thread.
horizonzy Jun 30, 2021
fe225c4
import code format.
horizonzy Jun 30, 2021
cdb392c
when task type is committed, also reset task.
horizonzy Jun 30, 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
59 changes: 32 additions & 27 deletions jraft-core/src/main/java/com/alipay/sofa/jraft/core/NodeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,6 @@
*/
package com.alipay.sofa.jraft.core;

import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;

import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.alipay.sofa.jraft.Closure;
import com.alipay.sofa.jraft.FSMCaller;
import com.alipay.sofa.jraft.JRaftServiceFactory;
Expand Down Expand Up @@ -127,6 +107,26 @@
import com.lmax.disruptor.RingBuffer;
import com.lmax.disruptor.dsl.Disruptor;
import com.lmax.disruptor.dsl.ProducerType;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.stream.Collectors;
horizonzy marked this conversation as resolved.
Show resolved Hide resolved

/**
* The raft replica node implementation.
Expand Down Expand Up @@ -298,7 +298,7 @@ public void onEvent(final LogEntryAndClosure event, final long sequence, final b
if (event.shutdownLatch != null) {
if (!this.tasks.isEmpty()) {
executeApplyingTasks(this.tasks);
this.tasks.clear();
reset();
}
final int num = GLOBAL_NUM_NODES.decrementAndGet();
LOG.info("The number of active nodes decrement to {}.", num);
Expand All @@ -309,9 +309,16 @@ public void onEvent(final LogEntryAndClosure event, final long sequence, final b
this.tasks.add(event);
if (this.tasks.size() >= NodeImpl.this.raftOptions.getApplyBatch() || endOfBatch) {
executeApplyingTasks(this.tasks);
this.tasks.clear();
reset();
}
}

private void reset() {
for (final LogEntryAndClosure task : tasks) {
task.reset();
}
this.tasks.clear();
}
}

/**
Expand Down Expand Up @@ -1357,12 +1364,10 @@ private void executeApplyingTasks(final List<LogEntryAndClosure> tasks) {
st.setError(RaftError.EBUSY, "Is transferring leadership.");
}
LOG.debug("Node {} can't apply, status={}.", getNodeId(), st);
final List<LogEntryAndClosure> savedTasks = new ArrayList<>(tasks);
final List<Closure> dones = tasks.stream().map(ele -> ele.done).collect(Collectors.toList());
Utils.runInThread(() -> {
for (int i = 0; i < size; i++) {
final LogEntryAndClosure task = savedTasks.get(i);
task.done.run(st);
task.reset();
for (final Closure done : dones) {
done.run(st);
}
});
return;
Expand Down