Skip to content

Commit

Permalink
fix: 'ocis backup consistency' file regex
Browse files Browse the repository at this point in the history
'ocis backup consistency' was stumbling over revision (and trash) nodes
whose timestamp lacked the nanosecond component (which happens if the nanoseconds
of the mtime are 0)

Fixes: #9498
  • Loading branch information
rhafer committed Nov 6, 2024
1 parent d2f373c commit f2e857f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
8 changes: 8 additions & 0 deletions changelog/unreleased/fix-backup-consistency-cmd.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Bugfix: 'ocis backup consistency' fixed for file revisions

A bug was fixed that caused the 'ocis backup consistency' command to incorrectly report
inconistencies when file revisions with a zero value for the nano-second part of the
timestamp were present.

https://github.com/owncloud/ocis/pull/10493
https://github.com/owncloud/ocis/issues/9498
4 changes: 2 additions & 2 deletions ocis/pkg/backup/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ var (

// regex to determine if a node is trashed or versioned.
// 9113a718-8285-4b32-9042-f930f1a58ac2.REV.2024-05-22T07:32:53.89969726Z
_versionRegex = regexp.MustCompile(`\.REV\.[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]+Z$`)
_versionRegex = regexp.MustCompile(`\.REV\.[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?Z$`)
// 9113a718-8285-4b32-9042-f930f1a58ac2.T.2024-05-23T08:25:20.006571811Z <- this HAS a symlink
_trashRegex = regexp.MustCompile(`\.T\.[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]+Z$`)
_trashRegex = regexp.MustCompile(`\.T\.[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(\.[0-9]+)?Z$`)
)

// Consistency holds the node and blob data of a storage provider
Expand Down

0 comments on commit f2e857f

Please sign in to comment.