Do polling based file watching for NFS on linux #2171
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
phoerious
requested changes
Aug 2, 2018
src/gui/DatabaseWidget.cpp
Outdated
| @@ -1215,6 +1215,21 @@ void DatabaseWidget::updateFilePath(const QString& filePath) | |||
| m_fileWatcher.removePath(m_filePath); | |||
| } | |||
|
|
|||
| #if defined(__linux) || defined(__linux__) || defined(linux) | |||
There was a problem hiding this comment.
Please use the Q_OS_LINUX def that Qt provides or Q_OS_UNIX if this also applies to other *nixes.
There was a problem hiding this comment.
I will change it to Q_OS_LINUX as statfs is only available on linux.
src/gui/DatabaseWidget.h
Outdated
| @@ -24,6 +24,10 @@ | |||
| #include <QStackedWidget> | |||
| #include <QTimer> | |||
|
|
|||
| #if defined(__linux) || defined(__linux__) || defined(linux) | |||
There was a problem hiding this comment.
See above. Is this header available on other *nix platforms? If not, are there alternatives?
vasporig
force-pushed
the
feature/nfs-polling
branch
from
b86f14b
to
c9208ee
Compare
|
The Windows implementation of the QFilesystemWatcher is based on FindFirstChangeNotification, which has the same problem: I will add this as well. |
|
@phoerious please update your review |
droidmonkey
changed the title
droidmonkey
force-pushed
the
feature/nfs-polling
branch
from
c9208ee
to
443bbef
Compare
phoerious
approved these changes
Sep 24, 2018
droidmonkey
force-pushed
the
feature/nfs-polling
branch
from
443bbef
to
8a25d4d
Compare
droidmonkey
approved these changes
Sep 26, 2018
droidmonkey
added a commit
that referenced
this pull request
Mar 19, 2019
- New Database Wizard [#1952] - Advanced Search [#1797] - Automatic update checker [#2648] - KeeShare database synchronization [#2109, #1992, #2738, #2742, #2746, #2739] - Improve favicon fetching; transition to Duck-Duck-Go [#2795, #2011, #2439] - Remove KeePassHttp support [#1752] - CLI: output info to stderr for easier scripting [#2558] - CLI: Add --quiet option [#2507] - CLI: Add create command [#2540] - CLI: Add recursive listing of entries [#2345] - CLI: Fix stdin/stdout encoding on Windows [#2425] - SSH Agent: Support OpenSSH for Windows [#1994] - macOS: TouchID Quick Unlock [#1851] - macOS: Multiple improvements; include CLI in DMG [#2165, #2331, #2583] - Linux: Prevent Klipper from storing secrets in clipboard [#1969] - Linux: Use polling based file watching for NFS [#2171] - Linux: Enable use of browser plugin in Snap build [#2802] - TOTP QR Code Generator [#1167] - High-DPI Scaling for 4k screens [#2404] - Make keyboard shortcuts more consistent [#2431] - Warn user if deleting referenced entries [#1744] - Allow toolbar to be hidden and repositioned [#1819, #2357] - Increase max allowed database timeout to 12 hours [#2173] - Password generator uses existing password length by default [#2318] - Improve alert message box button labels [#2376] - Show message when a database merge makes no changes [#2551] - Browser Integration Enhancements [#1497, #2253, #1904, #2232, #1850, #2218, #2391, #2396, #2542, #2622, #2637, #2790] - Overall Code Improvements [#2316, #2284, #2351, #2402, #2410, #2419, #2422, #2443, #2491, #2506, #2610, #2667, #2709, #2731]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add the ability to detect changes to the opened database if it's on NFS ( linux only ).
@jsachs referred to this fix
Description
Only on linux: before opening a database, check the type of the filesystem and if it's NFS use a polling FileSystemWatcher instead of the (default) inotify based one to detect changes.
Motivation and context
I'm running KeePassXC in an NFS environment.
How has this been tested?
Manually.
Screenshots (if appropriate):
Types of changes
Checklist:
-DWITH_ASAN=ON. [REQUIRED]