Skip to content

Commit ad5d925

Browse files
authored
Merge branch 'dev' into imgrefresh-batch2
2 parents 9b7b1a2 + 93ce118 commit ad5d925

File tree

16 files changed

+56
-717
lines changed

16 files changed

+56
-717
lines changed

modules/ROOT/content-nav.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@
6868
*** xref:kubernetes/operations/scaling.adoc[]
6969
*** xref:kubernetes/operations/image-pull-secret.adoc[]
7070
*** xref:kubernetes/operations/assign-neo4j-pods.adoc[]
71-
** Deploy a multi-data center Neo4j cluster
72-
*** xref:kubernetes/multi-dc-cluster/aks.adoc[]
7371
** xref:kubernetes/troubleshooting.adoc[]
7472
7573
* xref:configuration/index.adoc[]
-800 KB
Binary file not shown.

modules/ROOT/pages/backup-restore/aggregate.adoc

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[role=enterprise-edition]
22
[[aggregate-backup]]
33
= Aggregate a database backup chain
4-
:description: This section describes how to aggregate a backup chain into a single backup.
4+
:description: This section describes how to aggregate a backup chain into a single backup and recover a full backup.
55

66
[[aggregate-backup-command]]
77
== Command
@@ -17,6 +17,8 @@ The benefits of aggregating a backup chain are notably:
1717
As part of the aggregation, transactions contained in the differential backups are applied to the store contained in the full backup artifact.
1818
This operation is called _recovery_ and can be costly.
1919
* Reduces the risk of losing chain’s links.
20+
* Some commands, like consistency check, cannot run against a backup chain or a full backup that is not recovered.
21+
Aggregating produces an artifact they can work against.
2022

2123

2224
[role=label--changed-2025.01]
@@ -205,3 +207,40 @@ bin/neo4j-admin backup aggregate --from-path=azb://myStorageAccount/myContainer/
205207
----
206208
======
207209
=====
210+
211+
212+
[[aggregate-unrecovered-full-backup]]
213+
=== Aggregating an unrecovered full backup
214+
215+
To check if a full backup is in a recovered state, run the `neo4j-admin backup inspect` command:
216+
217+
[source,shell]
218+
----
219+
bin/neo4j-admin backup inspect /mnt/backups/neo4j-2025-09-10T08-14-56.backup
220+
----
221+
222+
The output will include the `RECOVERED` column.
223+
If it shows `false`, the backup is not yet recovered:
224+
225+
[output]
226+
----
227+
| FILE | DATABASE | DATABASE ID | TIME (UTC) | FULL | COMPRESSED | LOWEST TX | HIGHEST TX | STORE ID HASH | RECOVERED |
228+
| file:///mnt/backups/neo4j-2025-09-10T08-14-56.backup | neo4j | 4e98fab8-6ae6-46cc-84c0-61ee8a8db60a | 2025-09-10T08:14:56 | true | true | 1 | 3 | -116350002 | false |
229+
----
230+
231+
If your full backup is not recovered, aggregating it will perform recovery.
232+
Run the following command:
233+
234+
[source,shell]
235+
----
236+
bin/neo4j-admin backup aggregate --from-path=/mnt/backups/neo4j-2025-09-10T08-14-56.backup --keep-old-backup=true
237+
----
238+
239+
This command will:
240+
241+
* Generate a new, recovered backup alongside the existing one.
242+
* Preserve the original backup file (due to `--keep-old-backup=true`).
243+
244+
After aggregation, you can run consistency checker against the recovered backup and/or restore it.
245+
246+

modules/ROOT/pages/backup-restore/consistency-checker.adoc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
:description: Describes the Neo4j consistency checker.
2+
:page-aliases: tools/neo4j-admin/consistency-checker.adoc
23
[[consistency-checker]]
34
= Check database consistency
45

5-
You can use the `neo4j-admin database check` command to check the consistency of a database, a dump, or a full backup.
6+
You can use the `neo4j-admin database check` command to check the consistency of a database, a dump, or a full recovered backup.
67
The `neo4j-admin` tool is located in the _/bin_ directory.
78

89
== Syntax
@@ -201,8 +202,10 @@ Consistency check
201202

202203
[NOTE]
203204
====
204-
Note that consistency check is not supported for differential backups.
205-
The backup chain must be aggregated into a full backup artifact before running consistency check.
205+
Note that consistency check is not supported for differential backups or unrecovered full backups.
206+
The backup chain must be aggregated into a full recovered backup artifact before running consistency check.
207+
208+
See xref:backup-restore/aggregate.adoc[] for more details.
206209
====
207210

208211
Run with the `--from-path` option to check the consistency of a backup or a dump:

modules/ROOT/pages/clustering/unbind.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
:description: How to remove cluster state data from a Neo4j server using `neo4j-admin server unbind`.
2+
:page-aliases: tools/neo4j-admin/unbind.adoc
23
[role=enterprise-edition]
34
[[neo4j-admin-unbind]]
45
= Unbind a server

modules/ROOT/pages/configuration/migrate-configuration.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[[neo4j-admin-migrate-configuration]]
22
= Migrate configurations
33
:description: This chapter describes the `neo4j-admin server migrate-configuration` command.
4+
:page-aliases: tools/neo4j-admin/migrate-configuration.adoc
45

56
You can use the `migrate-configuration` command to migrate a legacy Neo4j configuration file to the current format.
67
The new version will be written in a target configuration directory.

modules/ROOT/pages/configuration/neo4j-admin-memrec.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
:description: This chapter describes the `memory-recommendation` command of Neo4j Admin.
2+
:page-aliases: tools/neo4j-admin/neo4j-admin-memrec.adoc
23
[[neo4j-admin-memrec]]
34
= Get initial memory recommendations
45

modules/ROOT/pages/configuration/validate-config.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[neo4j-admin-validate-config]]
22
= Validate configurations
3-
:page-role: new-5.5
43
:description: How to validate configurations using Neo4j Admin.
4+
:page-aliases: tools/neo4j-admin/validate-config.adoc
55

66

77
The `neo4j-admin server validate-config` command validates the Neo4j and Log4j configurations.

modules/ROOT/pages/cypher-shell.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
:description: Describes Neo4j Cypher Shell command-line interface (CLI) and how to use it.
2+
:page-aliases: tools/cypher-shell.adoc
23
[[cypher-shell]]
34
= Cypher Shell
45

modules/ROOT/pages/database-administration/standard-databases/migrate-database.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
:description: This chapter describes the `neo4j-admin database migrate` command.
2+
:page-aliases: tools/neo4j-admin/migrate-database.adoc
23
[[neo4j-admin-migrate]]
34
= Migrate a database
45

0 commit comments

Comments
 (0)