support "keep this much disk space free" on Windows as well as other platforms #637
Labels
No labels
c/code
c/code-dirnodes
c/code-encoding
c/code-frontend
c/code-frontend-cli
c/code-frontend-ftp-sftp
c/code-frontend-magic-folder
c/code-frontend-web
c/code-mutable
c/code-network
c/code-nodeadmin
c/code-peerselection
c/code-storage
c/contrib
c/dev-infrastructure
c/docs
c/operational
c/packaging
c/unknown
c/website
kw:2pc
kw:410
kw:9p
kw:ActivePerl
kw:AttributeError
kw:DataUnavailable
kw:DeadReferenceError
kw:DoS
kw:FileZilla
kw:GetLastError
kw:IFinishableConsumer
kw:K
kw:LeastAuthority
kw:Makefile
kw:RIStorageServer
kw:StringIO
kw:UncoordinatedWriteError
kw:about
kw:access
kw:access-control
kw:accessibility
kw:accounting
kw:accounting-crawler
kw:add-only
kw:aes
kw:aesthetics
kw:alias
kw:aliases
kw:aliens
kw:allmydata
kw:amazon
kw:ambient
kw:annotations
kw:anonymity
kw:anonymous
kw:anti-censorship
kw:api_auth_token
kw:appearance
kw:appname
kw:apport
kw:archive
kw:archlinux
kw:argparse
kw:arm
kw:assertion
kw:attachment
kw:auth
kw:authentication
kw:automation
kw:avahi
kw:availability
kw:aws
kw:azure
kw:backend
kw:backoff
kw:backup
kw:backupdb
kw:backward-compatibility
kw:bandwidth
kw:basedir
kw:bayes
kw:bbfreeze
kw:beta
kw:binaries
kw:binutils
kw:bitcoin
kw:bitrot
kw:blacklist
kw:blocker
kw:blocks-cloud-deployment
kw:blocks-cloud-merge
kw:blocks-magic-folder-merge
kw:blocks-merge
kw:blocks-raic
kw:blocks-release
kw:blog
kw:bom
kw:bonjour
kw:branch
kw:branding
kw:breadcrumbs
kw:brians-opinion-needed
kw:browser
kw:bsd
kw:build
kw:build-helpers
kw:buildbot
kw:builders
kw:buildslave
kw:buildslaves
kw:cache
kw:cap
kw:capleak
kw:captcha
kw:cast
kw:centos
kw:cffi
kw:chacha
kw:charset
kw:check
kw:checker
kw:chroot
kw:ci
kw:clean
kw:cleanup
kw:cli
kw:cloud
kw:cloud-backend
kw:cmdline
kw:code
kw:code-checks
kw:coding-standards
kw:coding-tools
kw:coding_tools
kw:collection
kw:compatibility
kw:completion
kw:compression
kw:confidentiality
kw:config
kw:configuration
kw:configuration.txt
kw:conflict
kw:connection
kw:connectivity
kw:consistency
kw:content
kw:control
kw:control.furl
kw:convergence
kw:coordination
kw:copyright
kw:corruption
kw:cors
kw:cost
kw:coverage
kw:coveralls
kw:coveralls.io
kw:cpu-watcher
kw:cpyext
kw:crash
kw:crawler
kw:crawlers
kw:create-container
kw:cruft
kw:crypto
kw:cryptography
kw:cryptography-lib
kw:cryptopp
kw:csp
kw:curl
kw:cutoff-date
kw:cycle
kw:cygwin
kw:d3
kw:daemon
kw:darcs
kw:darcsver
kw:database
kw:dataloss
kw:db
kw:dead-code
kw:deb
kw:debian
kw:debug
kw:deep-check
kw:defaults
kw:deferred
kw:delete
kw:deletion
kw:denial-of-service
kw:dependency
kw:deployment
kw:deprecation
kw:desert-island
kw:desert-island-build
kw:design
kw:design-review-needed
kw:detection
kw:dev-infrastructure
kw:devpay
kw:directory
kw:directory-page
kw:dirnode
kw:dirnodes
kw:disconnect
kw:discovery
kw:disk
kw:disk-backend
kw:distribute
kw:distutils
kw:dns
kw:do_http
kw:doc-needed
kw:docker
kw:docs
kw:docs-needed
kw:dokan
kw:dos
kw:download
kw:downloader
kw:dragonfly
kw:drop-upload
kw:duplicity
kw:dusty
kw:earth-dragon
kw:easy
kw:ec2
kw:ecdsa
kw:ed25519
kw:egg-needed
kw:eggs
kw:eliot
kw:email
kw:empty
kw:encoding
kw:endpoint
kw:enterprise
kw:enum34
kw:environment
kw:erasure
kw:erasure-coding
kw:error
kw:escaping
kw:etag
kw:etch
kw:evangelism
kw:eventual
kw:example
kw:excess-authority
kw:exec
kw:exocet
kw:expiration
kw:extensibility
kw:extension
kw:failure
kw:fedora
kw:ffp
kw:fhs
kw:figleaf
kw:file
kw:file-descriptor
kw:filename
kw:filesystem
kw:fileutil
kw:fips
kw:firewall
kw:first
kw:floatingpoint
kw:flog
kw:foolscap
kw:forward-compatibility
kw:forward-secrecy
kw:forwarding
kw:free
kw:freebsd
kw:frontend
kw:fsevents
kw:ftp
kw:ftpd
kw:full
kw:furl
kw:fuse
kw:garbage
kw:garbage-collection
kw:gateway
kw:gatherer
kw:gc
kw:gcc
kw:gentoo
kw:get
kw:git
kw:git-annex
kw:github
kw:glacier
kw:globalcaps
kw:glossary
kw:google-cloud-storage
kw:google-drive-backend
kw:gossip
kw:governance
kw:grid
kw:grid-manager
kw:gridid
kw:gridsync
kw:grsec
kw:gsoc
kw:gvfs
kw:hackfest
kw:hacktahoe
kw:hang
kw:hardlink
kw:heartbleed
kw:heisenbug
kw:help
kw:helper
kw:hint
kw:hooks
kw:how
kw:how-to
kw:howto
kw:hp
kw:hp-cloud
kw:html
kw:http
kw:https
kw:i18n
kw:i2p
kw:i2p-collab
kw:illustration
kw:image
kw:immutable
kw:impressions
kw:incentives
kw:incident
kw:init
kw:inlineCallbacks
kw:inotify
kw:install
kw:installer
kw:integration
kw:integration-test
kw:integrity
kw:interactive
kw:interface
kw:interfaces
kw:interoperability
kw:interstellar-exploration
kw:introducer
kw:introduction
kw:iphone
kw:ipkg
kw:iputil
kw:ipv6
kw:irc
kw:jail
kw:javascript
kw:joke
kw:jquery
kw:json
kw:jsui
kw:junk
kw:key-value-store
kw:kfreebsd
kw:known-issue
kw:konqueror
kw:kpreid
kw:kvm
kw:l10n
kw:lae
kw:large
kw:latency
kw:leak
kw:leasedb
kw:leases
kw:libgmp
kw:license
kw:licenss
kw:linecount
kw:link
kw:linux
kw:lit
kw:localhost
kw:location
kw:locking
kw:logging
kw:logo
kw:loopback
kw:lucid
kw:mac
kw:macintosh
kw:magic-folder
kw:manhole
kw:manifest
kw:manual-test-needed
kw:map
kw:mapupdate
kw:max_space
kw:mdmf
kw:memcheck
kw:memory
kw:memory-leak
kw:mesh
kw:metadata
kw:meter
kw:migration
kw:mime
kw:mingw
kw:minimal
kw:misc
kw:miscapture
kw:mlp
kw:mock
kw:more-info-needed
kw:mountain-lion
kw:move
kw:multi-users
kw:multiple
kw:multiuser-gateway
kw:munin
kw:music
kw:mutability
kw:mutable
kw:mystery
kw:names
kw:naming
kw:nas
kw:navigation
kw:needs-review
kw:needs-spawn
kw:netbsd
kw:network
kw:nevow
kw:new-user
kw:newcaps
kw:news
kw:news-done
kw:news-needed
kw:newsletter
kw:newurls
kw:nfc
kw:nginx
kw:nixos
kw:no-clobber
kw:node
kw:node-url
kw:notification
kw:notifyOnDisconnect
kw:nsa310
kw:nsa320
kw:nsa325
kw:numpy
kw:objects
kw:old
kw:openbsd
kw:openitp-packaging
kw:openssl
kw:openstack
kw:opensuse
kw:operation-helpers
kw:operational
kw:operations
kw:ophandle
kw:ophandles
kw:ops
kw:optimization
kw:optional
kw:options
kw:organization
kw:os
kw:os.abort
kw:ostrom
kw:osx
kw:osxfuse
kw:otf-magic-folder-objective1
kw:otf-magic-folder-objective2
kw:otf-magic-folder-objective3
kw:otf-magic-folder-objective4
kw:otf-magic-folder-objective5
kw:otf-magic-folder-objective6
kw:p2p
kw:packaging
kw:partial
kw:password
kw:path
kw:paths
kw:pause
kw:peer-selection
kw:performance
kw:permalink
kw:permissions
kw:persistence
kw:phone
kw:pickle
kw:pip
kw:pipermail
kw:pkg_resources
kw:placement
kw:planning
kw:policy
kw:port
kw:portability
kw:portal
kw:posthook
kw:pratchett
kw:preformance
kw:preservation
kw:privacy
kw:process
kw:profile
kw:profiling
kw:progress
kw:proxy
kw:publish
kw:pyOpenSSL
kw:pyasn1
kw:pycparser
kw:pycrypto
kw:pycrypto-lib
kw:pycryptopp
kw:pyfilesystem
kw:pyflakes
kw:pylint
kw:pypi
kw:pypy
kw:pysqlite
kw:python
kw:python3
kw:pythonpath
kw:pyutil
kw:pywin32
kw:quickstart
kw:quiet
kw:quotas
kw:quoting
kw:raic
kw:rainhill
kw:random
kw:random-access
kw:range
kw:raspberry-pi
kw:reactor
kw:readonly
kw:rebalancing
kw:recovery
kw:recursive
kw:redhat
kw:redirect
kw:redressing
kw:refactor
kw:referer
kw:referrer
kw:regression
kw:rekey
kw:relay
kw:release
kw:release-blocker
kw:reliability
kw:relnotes
kw:remote
kw:removable
kw:removable-disk
kw:rename
kw:renew
kw:repair
kw:replace
kw:report
kw:repository
kw:research
kw:reserved_space
kw:response-needed
kw:response-time
kw:restore
kw:retrieve
kw:retry
kw:review
kw:review-needed
kw:reviewed
kw:revocation
kw:roadmap
kw:rollback
kw:rpm
kw:rsa
kw:rss
kw:rst
kw:rsync
kw:rusty
kw:s3
kw:s3-backend
kw:s3-frontend
kw:s4
kw:same-origin
kw:sandbox
kw:scalability
kw:scaling
kw:scheduling
kw:schema
kw:scheme
kw:scp
kw:scripts
kw:sdist
kw:sdmf
kw:security
kw:self-contained
kw:server
kw:servermap
kw:servers-of-happiness
kw:service
kw:setup
kw:setup.py
kw:setup_requires
kw:setuptools
kw:setuptools_darcs
kw:sftp
kw:shared
kw:shareset
kw:shell
kw:signals
kw:simultaneous
kw:six
kw:size
kw:slackware
kw:slashes
kw:smb
kw:sneakernet
kw:snowleopard
kw:socket
kw:solaris
kw:space
kw:space-efficiency
kw:spam
kw:spec
kw:speed
kw:sqlite
kw:ssh
kw:ssh-keygen
kw:sshfs
kw:ssl
kw:stability
kw:standards
kw:start
kw:startup
kw:static
kw:static-analysis
kw:statistics
kw:stats
kw:stats_gatherer
kw:status
kw:stdeb
kw:storage
kw:streaming
kw:strports
kw:style
kw:stylesheet
kw:subprocess
kw:sumo
kw:survey
kw:svg
kw:symlink
kw:synchronous
kw:tac
kw:tahoe-*
kw:tahoe-add-alias
kw:tahoe-admin
kw:tahoe-archive
kw:tahoe-backup
kw:tahoe-check
kw:tahoe-cp
kw:tahoe-create-alias
kw:tahoe-create-introducer
kw:tahoe-debug
kw:tahoe-deep-check
kw:tahoe-deepcheck
kw:tahoe-lafs-trac-stream
kw:tahoe-list-aliases
kw:tahoe-ls
kw:tahoe-magic-folder
kw:tahoe-manifest
kw:tahoe-mkdir
kw:tahoe-mount
kw:tahoe-mv
kw:tahoe-put
kw:tahoe-restart
kw:tahoe-rm
kw:tahoe-run
kw:tahoe-start
kw:tahoe-stats
kw:tahoe-unlink
kw:tahoe-webopen
kw:tahoe.css
kw:tahoe_files
kw:tahoewapi
kw:tarball
kw:tarballs
kw:tempfile
kw:templates
kw:terminology
kw:test
kw:test-and-set
kw:test-from-egg
kw:test-needed
kw:testgrid
kw:testing
kw:tests
kw:throttling
kw:ticket999-s3-backend
kw:tiddly
kw:time
kw:timeout
kw:timing
kw:to
kw:to-be-closed-on-2011-08-01
kw:tor
kw:tor-protocol
kw:torsocks
kw:tox
kw:trac
kw:transparency
kw:travis
kw:travis-ci
kw:trial
kw:trickle
kw:trivial
kw:truckee
kw:tub
kw:tub.location
kw:twine
kw:twistd
kw:twistd.log
kw:twisted
kw:twisted-14
kw:twisted-trial
kw:twitter
kw:twn
kw:txaws
kw:type
kw:typeerror
kw:ubuntu
kw:ucwe
kw:ueb
kw:ui
kw:unclean
kw:uncoordinated-writes
kw:undeletable
kw:unfinished-business
kw:unhandled-error
kw:unhappy
kw:unicode
kw:unit
kw:unix
kw:unlink
kw:update
kw:upgrade
kw:upload
kw:upload-helper
kw:uri
kw:url
kw:usability
kw:use-case
kw:utf-8
kw:util
kw:uwsgi
kw:ux
kw:validation
kw:variables
kw:vdrive
kw:verify
kw:verlib
kw:version
kw:versioning
kw:versions
kw:video
kw:virtualbox
kw:virtualenv
kw:vista
kw:visualization
kw:visualizer
kw:vm
kw:volunteergrid2
kw:volunteers
kw:vpn
kw:wapi
kw:warners-opinion-needed
kw:warning
kw:weapi
kw:web
kw:web.port
kw:webapi
kw:webdav
kw:webdrive
kw:webport
kw:websec
kw:website
kw:websocket
kw:welcome
kw:welcome-page
kw:welcomepage
kw:wiki
kw:win32
kw:win64
kw:windows
kw:windows-related
kw:winscp
kw:workaround
kw:world-domination
kw:wrapper
kw:write-enabler
kw:wui
kw:x86
kw:x86-64
kw:xhtml
kw:xml
kw:xss
kw:zbase32
kw:zetuptoolz
kw:zfec
kw:zookos-opinion-needed
kw:zope
kw:zope.interface
p/blocker
p/critical
p/major
p/minor
p/normal
p/supercritical
p/trivial
r/cannot reproduce
r/duplicate
r/fixed
r/invalid
r/somebody else's problem
r/was already fixed
r/wontfix
r/worksforme
t/defect
t/enhancement
t/task
v/0.2.0
v/0.3.0
v/0.4.0
v/0.5.0
v/0.5.1
v/0.6.0
v/0.6.1
v/0.7.0
v/0.8.0
v/0.9.0
v/1.0.0
v/1.1.0
v/1.10.0
v/1.10.1
v/1.10.2
v/1.10a2
v/1.11.0
v/1.12.0
v/1.12.1
v/1.13.0
v/1.14.0
v/1.15.0
v/1.15.1
v/1.2.0
v/1.3.0
v/1.4.1
v/1.5.0
v/1.6.0
v/1.6.1
v/1.7.0
v/1.7.1
v/1.7β
v/1.8.0
v/1.8.1
v/1.8.2
v/1.8.3
v/1.8β
v/1.9.0
v/1.9.0-s3branch
v/1.9.0a1
v/1.9.0a2
v/1.9.0b1
v/1.9.1
v/1.9.2
v/1.9.2a1
v/cloud-branch
v/unknown
No milestone
No project
No assignees
4 participants
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference: tahoe-lafs/trac#637
Loading…
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
This patch changeset:2e45619844cb7c36 makes it so that if we don't know how to find out the free disk space on a platform, we fall back gracefully by display something like "I dunno" instead of the free disk space. We also already have code (before that patch) which falls back gracefully in the sense of emitting a warning at startup if the
reserved_space
feature has been configured (see src:doc/configuration.txt) and the current platform can't figure out how much free disk space it has.However, rather than having such fallbacks, I would really rather just ensure that Tahoe figures out how much free disk space it has on all supported platforms. For Windows (the only platform which currently does not work using
statvfs
), the way to do that is to requirepywin32
,import win32api
, and callwin32api.GetDiskFreeSpaceEx()
http://docs.activestate.com/activepython/2.5/pywin32/win32api__GetDiskFreeSpaceEx_meth.html
http://msdn.microsoft.com/en-us/library/aa364937(VS.85).aspx
Careful, don't call
win32api.GetDiskFreeSpace()
-- that's an old function that predates disks with more than 2^32^ bytes:http://msdn.microsoft.com/en-us/library/aa364935.aspx
Any Windows hackers want to fix this? It really bothers me to see Windows getting second-class-citizen treatment, but I don't have convenient access to a Windows box right now to work on, and I'm prioritizing testing, packaging, and release-management for the imminent Tahoe-LAFS v1.6 release.
It really should be pretty easy. In fact, I'm marking it with the "easy" tag.
I'll do this.
Hmm. It is possible that the call to get disk stats might fail, for some other reason than the API not being available. What should happen in that case?
Is it OK to delete redundant or now-misnamed helper methods like do_statvfs and stat_disk in storage/server.py? (I'll keep get_available_space.)
Hm, if the call to get disk stats were to fail, what should we do? I think I would suggest logging an error message and returning that there is zero disk space free.
It is okay (indeed encouraged) to refactor code to be cleaner whenever you make a change. (Part of the reason that this is okay is that each change is expected to have full test coverage.)
In _auto_deps.py:
Is this still a problem? Will things break if it is uncommented?
The easy_install bug against pywin32:
http://sourceforge.net/tracker/index.php?func=detail&aid=1799934&group_id=78018&atid=551954
isn't fixed. So I'll leave this as it is; the Windows build instructions at http://allmydata.org/trac/tahoe/wiki/InstallDetails already say to manually install pywin32.
Gack, I'm suffering from random Vista brokenness (I think it is this issue: http://cygwin.com/ml/cygwin/2009-04/msg00252.html ) that's stopping me from testing this patch. Might be a couple of days before I can get round to it.
Sigh. Waitaminute, why do you need cygwin to test your patch?
You are right to leave the
pywin32
requirement commented-out for now.Replying to zooko:
Done, and added a unit test for this.
Python depends on cygwin. Actually I'm not getting the same error any more, even though I all I did was build in a different bash prompt. (Doesn't it worry you when computers work nondeterministically?)
Attachment ticket637-untested.darcspatch.txt (35279 bytes) added
improved patch for ticket 637
Ah, I have two different Python installations (cygwin Python 2.5 and native-Windows Python 2.6). That explains it.
Okay so the current status is that we're waiting for unit tests, right?
If you like this ticket you may also like #814 (v1.4.1 storage servers sending a negative number for maximum-immutable-share-size?).
David-Sarah, are you planning to write a unit test for this?
Yes. It would just be a simple sanity check that get_disk_stats doesn't fail and returns values greater than zero on all platforms.
I've been a bit swamped and haven't had time to debug the current patch yet; currently it is causing other storage server tests to fail. Should get round to it later today.
Attachment ticket637-tested.darcspatch.txt (13354 bytes) added
Tested fix for #637 and #814
Sorry that took so long. The new patch is only tested on Windows (native); it needs review and testing on Unix and cygwin.
I'll take a stab at reviewing this (I can at least test it on OS X). ticket637-tested.darcspatch.txt looks like the output of darcs diff, though -- darcs apply barfs on it, at least. Would you mind updating that to be something from darcs send?
Here are instructions for how to generate patches: http://allmydata.org/trac/tahoe/wiki/Patches . Also if the patch submitter doesn't provide a
darcs send
-style patch but just adiff
-style patch, you can always just apply it withpatch
. That loses some metadata such as the original patch author's name, and it doesn't work well for patches which mv files, rename tokens or otherwise do something fancy, but if it works it works.Kevan: if you're planning to review this maybe "accept" the ticket so that it is assigned to you.
The tests work okay on my Mac.
I'm not sure how closely we adhere to PEP-8 (the CodingStandards page mentions it, but lots of code in tahoe-lafs ignores it), but a number of places in the patch violate it. In particular,
On lines 42 and 46 of src/allmydata/storage/server.py, you have Windows line endings instead of unix line endings. I'm not sure how big a deal this is, but most of the other code seems to use unix line endings.
I don't understand why we treat a failure in the win32api system call the same way as not having an API to determine disk usage. In the former case, we make the server read-only and report that it has no free space. In the latter case, we make the server writable and report that it has an arbitrary amount of free space. To me, these errors seem like two different expressions of the same problem -- that the server can't figure out how much free space there is. Why not treat them the same?
Or, put another way: If the user specifies a reserved space requirement, and we can't honor it (for whatever reason), we should make the server read only (or at least that seems more right to me).
(this isn't so much a critique of the patch -- indeed, this is existing behavior -- as a question that the patch makes me want to ask. Perhaps I should open another ticket for it?)
In any case, expressions of this issue are on lines 225 and 249 of src/allmydata/storage/server.py.
I like the tests -- I don't see any problems with them.
For _auto_deps.py and the docstrings in server.py, I just followed the conventions already used in those files.
The line endings should indeed be fixed.
import win32api, win32con
also violates PEP 8, although I can't actually see the reason for that style constraint.Re: error handling -- I assume you mean, why '''don't''' we treat a failure in the system call in the same way as not having an API? The reason is that not having an API is not an indication that there is anything wrong; just that the platform has a limitation that means we can't implement space checking.
If the platform does have the API, OTOH, then we're supposed to be enforcing space checking, and an admin may be expecting that we do. So a system call failure should be treated as an error in that case, as suggested by Zooko in comment:6.
That's right -- why aren't they treated the same. Sorry for the confusion.
I think I have a reply for your comment on error handling, but it is off topic -- your patch is consistent with the existing behavior of not enforcing space reservations when an API isn't available, and attempting to strongly enforce them on platforms that have an API. If I can articulate that into a good argument, I'll post it in another ticket.
In summary: with fixed windows line endings, and if the PEP8 leeway is okay, then this patch looks okay.
Thanks for the code review, Kevan! What about
_auto_deps.py
violates PEP-8?I updated CodingStandards to explicitly reject PEP-8's rule about importing multiple modules on a single
import
line and PEP-257's rule about closing multi-line docstrings with\n\n"""\n
.David-Sarah: The patch description currently says:
I.e., the first line is a blank line, the second line is 'q', and the third line is 'ticket637'. Please change it (by running
darcs amend
) to something like:Then re-attach the patch with the new description. Actually if you prefer I can make that change when I commit your patch.
From http://www.python.org/dev/peps/pep-0008/:
and
For flowing long blocks of text (docstrings or comments),
limiting the length to 72 characters is recommended.
Okay I've updated CodingStandards to add this pearl of wisdom:
Therefore David-Sarah's original patch is now in compliance with our coding standards. I'll amend it to have a nice patch description and I'll commit it.
We're already way over 79 characters for many lines in the existing source.
Actually I think (although this is probably the wrong place to have the discussion) that the 79-character limit is completely obsolete for modern screens and programming languages. Consider lines such as
or
Wrapping them would just make them less readable, not more.
OTOH, 100 characters is a reasonable limit, so I'll try to reformat the patch to satisfy that.
Apologies for the darcs patch description; darcs dumped me into an editor that was using the wrong code page, so I got a screenful of mojibake and had to type the description blind.
Okay, cool. I don't really care either way about the line widths; it was intended as an informational item more than anything else. :)
Attachment ticket637.darcspatch.txt (35270 bytes) added
storage server: detect disk space usage on Windows too (fixes #637)
Line widths fixed, like it or not :-) Also the line endings and patch description.
It looks like the clause at line 229 (in
get_stats
) will put a negative number intostorage_server.disk_avail
, while I think it should be clamped at zero. Likewise,get_available_space
and thusremote_get_version
will see negative numbers. If #814 is supposed to be subsumed by this ticket, we'll need to fix that.Maybe
get_disk_stats
should clamp theavail
value at zero before returning anything?Replying to warner:
It already does; see
server.py
line 205.Also see
test_disk_stats
intest_storage.py
, line 481, although that obviously only tests the result of one call.Replying to [davidsarah]comment:35:
Actually this doesn't test the clamp on
avail
because it usesreserved_space=0
. Buttest_disk_stats_avail_nonnegative
just after it does test thatavail
is clamped to zero.Doh, I don't know how I missed that.. must have been sleepy.
Excellent patch! Committed, in changeset:ef002c935a15eb76. The only change I made (in a second patch) was to the comment about readonly_storage causing
avail<=0
. The original was correct: it always causesavail=0
.thanks!
Replying to warner:
You mean
server.py
line 326? It wasremaining_space <= 0
, and my change was correct.remaining_space
is>= 0
orNone
at line 309, but notice line 315,remaining_space -= self.allocated_size()
.Gahh.. you're absolutely right. I've reverted to your version. And I'm going to stop trying to fix other people's fixes now.
(actually, I recently learned a term for these inevitable bugs in correcting-someone-else patches: Muphry's Law)