[NFS] Implement nfs timeout / advancedsettings #15686

peak3d · 2019-03-06T15:00:58Z

Description

If NFS mount is configured in Kodi client, but NFS server is down, we currently run into many deadlock situations:

during play PAPlayer holds the context lock while trying to nfs_read
when refreshing ListItems the Jobworker holds the context lock during nfs_stat
on startup connection discovery locks the context lock, too.

Issue is, that our main thread, ProcessSlow() deadlocks the complete kodi application in that case.

Because of this the NFS timeout is with this PR limited to 5 seconds by default, but can be reconfigured using the advancedsettings (in seconds):

<network>
  <nfstimeout>2</nfstimeout>
</network>

The above examle sets the timeout to 2 sec.
A value of 0 does not set any timeout and NFS waits forever (default behaviour without this PR).

Valid nfstimeout values are between 0 and 3600 seconds.

Motivation and Context

Deadlocks here and there if my NFS server goes into sleep, or if I move with my phone away from home.

How Has This Been Tested?

play music over nfs
suspend the nfs server
navigate back

Types of change

Bug fix (non-breaking change which fixes an issue)
Clean up (non-breaking change which removes non-working, unmaintained functionality)
Improvement (non-breaking change which improves existing functionality)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that will cause existing functionality to change)
Cosmetic change (non-breaking change that doesn't touch code)
None of the above (please explain below)

peak3d · 2019-03-06T15:53:51Z

jenkins build this please

Rechi · 2019-03-06T16:13:45Z

xbmc/filesystem/NFSFile.cpp

+{
+  uint32_t timeout = CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_nfsTimeout;
+  if (~timeout)
+    nfs_set_timeout(context, timeout);


This will break compiling on Ubuntu Xenial (16.04) with enabled nfs support.

Because the version does not support nfs_set_timeout ? If so, do we have the libnfs version somewhere during compile time?

nfs_set_timeout is available since 2.0.0 (sahlberg/libnfs@b01776c)
Ubuntu Xenial (16.04) provides 1.9.8 (https://packages.ubuntu.com/xenial/libnfs-dev)

Rechi · 2019-03-07T08:17:28Z

cmake/modules/FindNFS.cmake

@@ -34,7 +34,10 @@ find_package_handle_standard_args(NFS
 if(NFS_FOUND)
  set(NFS_LIBRARIES ${NFS_LIBRARY})
  set(NFS_INCLUDE_DIRS ${NFS_INCLUDE_DIR})
-  set(NFS_DEFINITIONS -DHAS_FILESYSTEM_NFS=1)
+
+  string(REPLACE "." ";" VERSION_LIST ${NFS_VERSION})


On Windows this fails with the following error,

CMake Error at cmake/modules/FindNFS.cmake:38 (string): string sub-command REPLACE requires at least four arguments. Call Stack (most recent call first): cmake/scripts/common/Macros.cmake:366 (find_package) cmake/scripts/common/Macros.cmake:432 (find_package_with_ver) CMakeLists.txt:177 (core_optional_dep)

peak3d · 2019-03-07T19:01:59Z

@Rechi pls. review again, thx!

Ubuntu and Windows issues fixed

cmake/modules/FindNFS.cmake

peak3d · 2019-03-07T20:02:36Z

Ok, thx for the fix, will add it.

peak3d · 2019-03-14T15:19:12Z

jenkins build this please

xbmc/settings/AdvancedSettings.cpp

Kal42 · 2020-02-09T17:42:39Z

Any update on this ?

phunkyfish · 2020-03-08T22:34:54Z

@peak3d do you want to progress this, close it or put it on the backburner?

peak3d · 2020-03-08T23:04:09Z

I'll check tomorrow

pepeq2 · 2020-04-13T21:42:47Z

Any news on this?
Would be nice to have it implemented...

phunkyfish · 2020-04-16T17:46:06Z

@peak3d did you ever check this?

:)

peak3d · 2020-06-05T16:03:46Z

Jenkins build this please

Bump version to untagged commit hash to support features implemented in xbmc#15686

peak3d · 2020-06-09T19:30:13Z

Jenkins build this please

Bump version to untagged commit hash to support features implemented in xbmc#15686

peak3d · 2020-06-10T10:05:17Z

Jenkins build this please

peak3d · 2020-06-10T12:45:35Z

Jenkins build this please

[NFS] Implement nfs timeout / advancedsettings

peak3d added Type: Fix non-breaking change which fixes an issue v18 Leia Component: Network labels Mar 6, 2019

peak3d added this to the Leia 18.2-rc1 milestone Mar 6, 2019

peak3d force-pushed the nfs branch from dbd7d84 to c4b27b1 Compare March 6, 2019 15:20

Rechi previously requested changes Mar 6, 2019

View reviewed changes

peak3d force-pushed the nfs branch 2 times, most recently from 3019596 to 03fb5fd Compare March 6, 2019 21:59

Rechi reviewed Mar 7, 2019

View reviewed changes

peak3d force-pushed the nfs branch 2 times, most recently from 6d567d7 to 711124c Compare March 7, 2019 19:01

Rechi reviewed Mar 7, 2019

View reviewed changes

cmake/modules/FindNFS.cmake Outdated Show resolved Hide resolved

peak3d force-pushed the nfs branch 2 times, most recently from 49cce93 to 186d856 Compare March 14, 2019 14:04

peak3d force-pushed the nfs branch from 186d856 to 0f44b81 Compare March 15, 2019 12:24

wsnipex reviewed Mar 16, 2019

View reviewed changes

xbmc/settings/AdvancedSettings.cpp Show resolved Hide resolved

Rechi removed the v18 Leia label Apr 16, 2019

Rechi removed this from the Leia 18.2-rc1 milestone Apr 16, 2019

jenkins4kodi added the Rebase needed PR that does not apply/merge cleanly to current base branch label Feb 18, 2020

phunkyfish added the PR Cleanup: Ask Author PR appears to still be relevant and mergeable. Comment to author to check on status. label Mar 8, 2020

peak3d requested a review from wsnipex June 5, 2020 15:51

peak3d force-pushed the nfs branch from c03ab65 to babe32e Compare June 5, 2020 16:00

peak3d force-pushed the nfs branch from babe32e to 8fb5eda Compare June 9, 2020 07:53

fuzzard pushed a commit to fuzzard/xbmc that referenced this pull request Jun 9, 2020

[libnfs] bump to untagged commit to support PR xbmc#15686

e38f7af

Bump version to untagged commit hash to support features implemented in xbmc#15686

fuzzard mentioned this pull request Jun 9, 2020

[depends] bump libnfs to 4.0.0 #17512

Merged

13 tasks

Implement NFS timeout

7b5c325

peak3d force-pushed the nfs branch from 8fb5eda to 7b5c325 Compare June 9, 2020 20:24

fuzzard pushed a commit to fuzzard/xbmc that referenced this pull request Jun 9, 2020

[libnfs] bump to untagged commit to support PR xbmc#15686

ab91a67

Bump version to untagged commit hash to support features implemented in xbmc#15686

fuzzard pushed a commit to fuzzard/xbmc that referenced this pull request Jun 9, 2020

[libnfs] bump to untagged commit to support PR xbmc#15686

53ea581

Bump version to untagged commit hash to support features implemented in xbmc#15686

fuzzard pushed a commit to fuzzard/xbmc that referenced this pull request Jun 10, 2020

[libnfs] bump to untagged commit to support PR xbmc#15686

398b891

Bump version to untagged commit hash to support features implemented in xbmc#15686

peak3d merged commit 0aceba9 into xbmc:master Jun 10, 2020

peak3d deleted the nfs branch June 10, 2020 15:20

Maven85 pushed a commit to Maven85/kodi that referenced this pull request Jun 14, 2020

Merge pull request xbmc#15686 from peak3d/nfs

78ed929

[NFS] Implement nfs timeout / advancedsettings

Maven85 pushed a commit to Maven85/kodi that referenced this pull request Jun 15, 2020

Merge pull request xbmc#15686 from peak3d/nfs

c33da3c

[NFS] Implement nfs timeout / advancedsettings

Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 3, 2020

Merge pull request xbmc#15686 from peak3d/nfs

141ea5e

[NFS] Implement nfs timeout / advancedsettings

Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 4, 2020

Merge pull request xbmc#15686 from peak3d/nfs

5d96503

[NFS] Implement nfs timeout / advancedsettings

Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 4, 2020

Merge pull request xbmc#15686 from peak3d/nfs

7ed35fa

[NFS] Implement nfs timeout / advancedsettings

Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 5, 2020

Merge pull request xbmc#15686 from peak3d/nfs

5d7f189

[NFS] Implement nfs timeout / advancedsettings

Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 5, 2020

Merge pull request xbmc#15686 from peak3d/nfs

b376975

[NFS] Implement nfs timeout / advancedsettings

Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 6, 2020

Merge pull request xbmc#15686 from peak3d/nfs

e6bbaf0

[NFS] Implement nfs timeout / advancedsettings

Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 6, 2020

Merge pull request xbmc#15686 from peak3d/nfs

6331e1f

[NFS] Implement nfs timeout / advancedsettings

Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 6, 2020

Merge pull request xbmc#15686 from peak3d/nfs

a7ad150

[NFS] Implement nfs timeout / advancedsettings

Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 6, 2020

Merge pull request xbmc#15686 from peak3d/nfs

ff65b01

[NFS] Implement nfs timeout / advancedsettings

Maven85 pushed a commit to Maven85/kodi that referenced this pull request Aug 7, 2020

Merge pull request xbmc#15686 from peak3d/nfs

d4164f8

[NFS] Implement nfs timeout / advancedsettings

KarellenX added the Wiki: Done label Nov 20, 2020

CvH mentioned this pull request Nov 6, 2021

[nfs] change connection timeout to 30sec #20475

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[NFS] Implement nfs timeout / advancedsettings #15686

[NFS] Implement nfs timeout / advancedsettings #15686

peak3d commented Mar 6, 2019 •

edited

peak3d commented Mar 6, 2019

Rechi Mar 6, 2019

peak3d Mar 6, 2019

Rechi Mar 6, 2019

Rechi Mar 7, 2019

peak3d commented Mar 7, 2019

peak3d commented Mar 7, 2019

peak3d commented Mar 14, 2019

Kal42 commented Feb 9, 2020

phunkyfish commented Mar 8, 2020

peak3d commented Mar 8, 2020

pepeq2 commented Apr 13, 2020

phunkyfish commented Apr 16, 2020

peak3d commented Jun 5, 2020

peak3d commented Jun 9, 2020

peak3d commented Jun 10, 2020

peak3d commented Jun 10, 2020

[NFS] Implement nfs timeout / advancedsettings #15686

[NFS] Implement nfs timeout / advancedsettings #15686

Conversation

peak3d commented Mar 6, 2019 • edited

Description

Motivation and Context

How Has This Been Tested?

Types of change

peak3d commented Mar 6, 2019

Rechi Mar 6, 2019

Choose a reason for hiding this comment

peak3d Mar 6, 2019

Choose a reason for hiding this comment

Rechi Mar 6, 2019

Choose a reason for hiding this comment

Rechi Mar 7, 2019

Choose a reason for hiding this comment

peak3d commented Mar 7, 2019

peak3d commented Mar 7, 2019

peak3d commented Mar 14, 2019

Kal42 commented Feb 9, 2020

phunkyfish commented Mar 8, 2020

peak3d commented Mar 8, 2020

pepeq2 commented Apr 13, 2020

phunkyfish commented Apr 16, 2020

peak3d commented Jun 5, 2020

peak3d commented Jun 9, 2020

peak3d commented Jun 10, 2020

peak3d commented Jun 10, 2020

peak3d commented Mar 6, 2019 •

edited