Report command uses tx location from config

neo4j · Feb 14, 2024 · a0f1bdc · a0f1bdc
1 parent 634861e
commit a0f1bdc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...el/src/main/java/org/neo4j/kernel/diagnostics/KernelDiagnosticsOfflineReportProvider.java b/...el/src/main/java/org/neo4j/kernel/diagnostics/KernelDiagnosticsOfflineReportProvider.java
@@ -31,6 +31,7 @@
 import org.neo4j.configuration.GraphDatabaseSettings;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.layout.DatabaseLayout;
+import org.neo4j.io.layout.Neo4jLayout;
 import org.neo4j.kernel.diagnostics.providers.StoreFilesDiagnostics;
 import org.neo4j.kernel.impl.transaction.log.files.LogFiles;
 import org.neo4j.kernel.impl.transaction.log.files.LogFilesBuilder;
@@ -54,7 +55,7 @@ public void init( FileSystemAbstraction fs, String defaultDatabaseName, Config c
     {
         this.fs = fs;
         this.config = config;
-        this.databaseLayout = DatabaseLayout.ofFlat( storeDirectory.resolve( defaultDatabaseName ) );
+        this.databaseLayout = DatabaseLayout.of( Neo4jLayout.of(config), defaultDatabaseName );
     }
 
     @Override
@@ -193,7 +194,7 @@ private void getTransactionLogFiles( List<DiagnosticsReportSource> sources )
     {
         try
         {
-            LogFiles logFiles = LogFilesBuilder.logFilesBasedOnlyBuilder( databaseLayout.databaseDirectory(), fs ).build();
+            LogFiles logFiles = LogFilesBuilder.logFilesBasedOnlyBuilder( databaseLayout.getTransactionLogsDirectory(), fs ).build();
             for ( Path file : logFiles.logFiles() )
             {
                 sources.add( DiagnosticsReportSources.newDiagnosticsFile( "tx/" + file.getFileName(), fs, file ) );

diff --git a/community/layout/src/main/java/org/neo4j/io/layout/DatabaseLayout.java b/community/layout/src/main/java/org/neo4j/io/layout/DatabaseLayout.java
@@ -67,7 +67,7 @@ public static DatabaseLayout of( Config config )
         return Neo4jLayout.of( config ).databaseLayout( config.get( GraphDatabaseSettings.default_database ) );
     }
 
-    static DatabaseLayout of( Neo4jLayout neo4jLayout, String databaseName )
+    public static DatabaseLayout of( Neo4jLayout neo4jLayout, String databaseName )
     {
         return new DatabaseLayout( neo4jLayout, databaseName );
     }