Revert "OAK-11766 Write Throttling Mechanism - Session.save() delay (#2339)"

This reverts commit 201c1c8.

Author: reschke

oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/RepositoryManagementMBean.java

@@ -263,20 +263,4 @@ CompositeData startDataStoreGC(@Name("markOnly")
     @Description("Refresh all currently open sessions")
     TabularData refreshAllSessions();
 
-    /**
-     * Get the Session.save() delay configuration.
-     *
-     * @return the configuration
-     */
-    @Description("The Session.save() delay configuration")
-    String getSessionSaveDelayerConfig();
-
-    /**
-     * Set the Session.save() delay configuration.
-     *
-     * @param config the new configuration
-     */
-    @Description("The Session.save() delay configuration")
-    void setSessionSaveDelayerConfig(String config);
-
 }

oak-api/src/main/java/org/apache/jackrabbit/oak/api/jmx/package-info.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-@Version("4.15.0")
+@Version("4.14.0")
 package org.apache.jackrabbit.oak.api.jmx;
 
 import org.osgi.annotation.versioning.Version;

oak-core/src/main/java/org/apache/jackrabbit/oak/management/RepositoryManager.java

@@ -56,7 +56,6 @@
  */
 public class RepositoryManager extends AnnotatedStandardMBean implements RepositoryManagementMBean {
     private final Whiteboard whiteboard;
-    private String sessionSaveConfig;
 
     public RepositoryManager(@NotNull Whiteboard whiteboard) {
         super(RepositoryManagementMBean.class);
@@ -278,14 +277,4 @@ public Status apply(SessionMBean sessionMBean) {
             }
         }));
     }
-
-    @Override
-    public String getSessionSaveDelayerConfig() {
-        return sessionSaveConfig;
-    }
-
-    @Override
-    public void setSessionSaveDelayerConfig(String config) {
-        this.sessionSaveConfig = config;
-    }
 }

oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java

@@ -54,7 +54,6 @@
 import org.apache.jackrabbit.oak.jcr.session.RefreshStrategy;
 import org.apache.jackrabbit.oak.jcr.session.RefreshStrategy.Composite;
 import org.apache.jackrabbit.oak.jcr.session.SessionNamespaces;
-import org.apache.jackrabbit.oak.jcr.session.SessionSaveDelayer;
 import org.apache.jackrabbit.oak.jcr.session.SessionStats;
 import org.apache.jackrabbit.oak.jcr.session.SessionStats.Counters;
 import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation;
@@ -139,8 +138,6 @@ public class SessionDelegate {
 
     private final SessionNamespaces namespaces;
 
-    private final SessionSaveDelayer sessionSaveDelayer;
-
     /**
      * Create a new session delegate for a {@code ContentSession}. The refresh behaviour of the
      * session is governed by the value of the {@code refreshInterval} argument: if the session
@@ -153,16 +150,14 @@ public class SessionDelegate {
      * @param securityProvider the security provider
      * @param refreshStrategy  the refresh strategy used for auto refreshing this session
      * @param statisticManager the statistics manager for tracking session operations
-     * @param sessionSaveDelayer the session save delay mechanism
      */
     public SessionDelegate(
             @NotNull ContentSession contentSession,
             @NotNull SecurityProvider securityProvider,
             @NotNull RefreshStrategy refreshStrategy,
             @NotNull ThreadLocal<Long> threadSaveCount,
             @NotNull StatisticManager statisticManager,
-            @NotNull Clock clock,
-            @NotNull SessionSaveDelayer sessionSaveDelayer) {
+            @NotNull Clock clock) {
         this.contentSession = requireNonNull(contentSession);
         this.securityProvider = requireNonNull(securityProvider);
         this.root = contentSession.getLatestRoot();
@@ -181,7 +176,6 @@ refreshAtNextAccess, saveCountRefresh, new RefreshNamespaces(
         readDuration = statisticManager.getTimer(SESSION_READ_DURATION);
         writeCounter = statisticManager.getMeter(SESSION_WRITE_COUNTER);
         writeDuration = statisticManager.getTimer(SESSION_WRITE_DURATION);
-        this.sessionSaveDelayer = sessionSaveDelayer;
     }
 
     @NotNull
@@ -398,7 +392,6 @@ private void commit(Root root, String path) throws CommitFailedException {
         if (userData != null) {
             info.put(EventFactory.USER_DATA, userData);
         }
-        sessionSaveDelayer.delayIfNeeded(userData);
         root.commit(Collections.unmodifiableMap(info));
         if (permissionProvider != null && refreshPermissionProvider) {
             permissionProvider.refresh();

oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java

@@ -54,7 +54,6 @@
 import org.apache.jackrabbit.oak.jcr.session.RefreshStrategy;
 import org.apache.jackrabbit.oak.jcr.session.RefreshStrategy.Composite;
 import org.apache.jackrabbit.oak.jcr.session.SessionContext;
-import org.apache.jackrabbit.oak.jcr.session.SessionSaveDelayer;
 import org.apache.jackrabbit.oak.jcr.session.SessionStats;
 import org.apache.jackrabbit.oak.jcr.version.FrozenNodeLogger;
 import org.apache.jackrabbit.oak.plugins.observation.CommitRateLimiter;
@@ -121,7 +120,6 @@ public class RepositoryImpl implements JackrabbitRepository {
     private final MountInfoProvider mountInfoProvider;
     private final BlobAccessProvider blobAccessProvider;
     private final SessionQuerySettingsProvider sessionQuerySettingsProvider;
-    private final SessionSaveDelayer sessionSaveDelayer;
 
     /**
      * {@link ThreadLocal} counter that keeps track of the save operations
@@ -178,7 +176,6 @@ public RepositoryImpl(@NotNull ContentRepository contentRepository,
         this.frozenNodeLogger = new FrozenNodeLogger(clock, whiteboard);
         this.sessionQuerySettingsProvider = Optional.ofNullable(WhiteboardUtils.getService(whiteboard, SessionQuerySettingsProvider.class))
                 .orElseGet(() -> new FastQuerySizeSettingsProvider(fastQueryResultSize));
-        this.sessionSaveDelayer = new SessionSaveDelayer(whiteboard);
     }
 
     //---------------------------------------------------------< Repository >---
@@ -327,7 +324,7 @@ private SessionDelegate createSessionDelegate(
 
         return new SessionDelegate(
                 contentSession, securityProvider, refreshStrategy,
-                threadSaveCount, statisticManager, clock, sessionSaveDelayer) {
+                threadSaveCount, statisticManager, clock) {
 
             // Defer session MBean registration to avoid cluttering the
             // JMX name space with short lived sessions
@@ -357,7 +354,6 @@ public void shutdown() {
         statisticManager.dispose();
         gcMonitorRegistration.unregister();
         frozenNodeLogger.close();
-        sessionSaveDelayer.close();
         clock.close();
         new ExecutorCloser(scheduledExecutor).close();
         if (contentRepository instanceof Closeable) {