Index: oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java =================================================================== --- oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java (revision 1867907) +++ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java (working copy) @@ -335,6 +335,9 @@ } } + // adjust commit root when it falls on a bundled node + commitRootPath = bundledNodes.getOrDefault(commitRootPath, commitRootPath); + rollback = new Rollback(revision, opLog, Utils.getIdFromPath(commitRootPath), nodeStore.getCreateOrUpdateBatchSize()); Index: oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java =================================================================== --- oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java (revision 1867909) +++ oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java (working copy) @@ -64,7 +64,6 @@ import org.jetbrains.annotations.NotNull; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -864,7 +863,6 @@ return names; } - @Ignore("OAK-8667") @Test public void deleteDescendantNodesOfBundledNode() throws Exception { NodeBuilder builder = store.getRoot().builder();