mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix location log update for copy to 1-node cluster

Browse source
This commit is contained in:
Joey Hess 2024-06-23 09:53:33 -04:00
parent 5b332a87be
commit 2762f9c4ce
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
P2P/Proxy.hs
View file

@ -303,16 +303,17 @@ proxy proxydone proxymethods servermode (ClientSide clientrunst clientconn) remo
handleGET remoteside message = getresponse (runRemoteSide remoteside) message $ handleGET remoteside message = getresponse (runRemoteSide remoteside) message $
withDATA (relayGET remoteside) withDATA (relayGET remoteside)
handlePUT (remoteside:[]) k message = handlePUT (remoteside:[]) k message
getresponse (runRemoteSide remoteside) message $ \resp -> case resp of | remoteUUID remoteside == remoteuuid =
ALREADY_HAVE -> protoerrhandler proxynextclientmessage $ getresponse (runRemoteSide remoteside) message $ \resp -> case resp of
client $ net $ sendMessage resp ALREADY_HAVE -> protoerrhandler proxynextclientmessage $
ALREADY_HAVE_PLUS _ -> protoerrhandler proxynextclientmessage $ client $ net $ sendMessage resp
client $ net $ sendMessage resp ALREADY_HAVE_PLUS _ -> protoerrhandler proxynextclientmessage $
PUT_FROM _ -> client $ net $ sendMessage resp
getresponse client resp $ PUT_FROM _ ->
withDATA (relayPUT remoteside k) getresponse client resp $
_ -> protoerr withDATA (relayPUT remoteside k)
_ -> protoerr
handlePUT [] _ _ = handlePUT [] _ _ =
protoerrhandler proxynextclientmessage $ protoerrhandler proxynextclientmessage $
client $ net $ sendMessage ALREADY_HAVE client $ net $ sendMessage ALREADY_HAVE
@ -474,7 +475,6 @@ proxy proxydone proxymethods servermode (ClientSide clientrunst clientconn) remo
client $ net $ sendMessage $ client $ net $ sendMessage $
case concat (catMaybes storeduuids) of case concat (catMaybes storeduuids) of
[] -> FAILURE [] -> FAILURE
(_u:[]) -> SUCCESS
us us
| protocolversion < 2 -> SUCCESS | protocolversion < 2 -> SUCCESS
| otherwise -> SUCCESS_PLUS us | otherwise -> SUCCESS_PLUS us

4
doc/todo/git-annex_proxies.mdwn
View file

@ -74,10 +74,6 @@ For June's work on [[design/passthrough_proxy]], implementation plan:
check may fail to realize that dropping from multiple nodes does in fact check may fail to realize that dropping from multiple nodes does in fact
make it worse. make it worse.
* Bug: When a cluster has one node, copying a file to it does not update
location log to say the content is present on it. It's returning SUCCESS
rather than SUCCESS-PLUS.
* Support annex.jobs for clusters. * Support annex.jobs for clusters.
* On upload to a cluster, as well as fanout to nodes, if the key is * On upload to a cluster, as well as fanout to nodes, if the key is