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

Revert "sim: add commands for cluster management"

Browse source 
This reverts commit 344141da63.

Rethinking this
This commit is contained in:
Joey Hess 2024-09-25 12:11:03 -04:00
parent 85418d6c72
commit b9214d4162
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 0 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Annex/Sim.hs
View file

@ -71,7 +71,6 @@ data SimState t = SimState
, simGroupWanted :: M.Map Group PreferredContentExpression
, simMaxSize :: M.Map UUID MaxSize
, simRebalance :: Bool
, simClusters :: M.Map RepoName (S.Set RemoteName)
, simHistory :: [SimCommand]
, simVectorClock :: VectorClock
, simRootDirectory :: FilePath
@ -95,7 +94,6 @@ emptySimState rngseed rootdir = SimState
, simGroupWanted = mempty
, simMaxSize = mempty
, simRebalance = False
, simClusters = mempty
, simHistory = []
, simVectorClock = VectorClock 0
, simRootDirectory = rootdir
@ -232,9 +230,6 @@ data SimCommand
| CommandRandomGroupWanted Group [PreferredContentExpression]
| CommandMaxSize RepoName MaxSize
| CommandRebalance Bool
| CommandInitCluster RepoName
| CommandAddCluster RepoName [RemoteName]
| CommandRemoveCluster RepoName RemoteName
| CommandVisit RepoName [String]
| CommandComment String
| CommandBlank
@ -529,34 +524,6 @@ applySimCommand' (CommandRebalance b) st _ =
Right $ Right $ st
{ simRebalance = b
}
applySimCommand' (CommandInitCluster clustername) st _ =
checkNonexistantRepo clustername st $
let (u, st') = genSimUUID st clustername
st'' = st'
{ simClusters = M.insert clustername mempty
(simClusters st')
}
in Right $ Right $
addRepo clustername (newSimRepoConfig u False) st''
applySimCommand' (CommandAddCluster clustername nodes) st _ =
checkKnownRepo clustername st $ \u ->
case M.lookup clustername (simClusters st) of
Nothing -> Left $ fromRepoName clustername ++ " is not a cluster (use initcluster before addcluster)"
Just nodeset ->
let nodeset' = S.union nodeset (S.fromList nodes)
in Right $ Right $ st
{ simClusters = M.insert clustername nodeset'
(simClusters st)
}
applySimCommand' (CommandRemoveCluster clustername node) st _ =
case M.lookup clustername (simClusters st) of
Nothing -> Left $ fromRepoName clustername ++ " is not a cluster"
Just nodeset ->
let nodeset' = S.delete node nodeset
in Right $ Right $ st
{ simClusters = M.insert clustername nodeset'
(simClusters st)
}
applySimCommand' (CommandComment _) st _ = Right $ Right st
applySimCommand' CommandBlank st _ = Right $ Right st
applySimCommand' (CommandVisit _ _) _ _ = error "applySimCommand' CommandVisit"

12
Annex/Sim/File.hs
View file

@ -88,12 +88,6 @@ generateSimFile = unlines . map unwords . go
["maxsize", repo, showsize (fromMaxSize maxsize)] : go rest
go (CommandRebalance b : rest) =
["rebalance", if b then "on" else "off"] : go rest
go (CommandInitCluster (RepoName repo) : rest) =
["initcluster", repo] : go rest
go (CommandAddCluster (RepoName repo) nodes : rest) =
("addcluster" : repo : map fromRemoteName nodes) : go rest
go (CommandRemoveCluster (RepoName repo) (RemoteName node) : rest) =
["removecluster", repo, node] : go rest
go (CommandVisit (RepoName repo) cmdparams : rest) =
(["visit", repo] ++ cmdparams) : go rest
go (CommandComment s : rest) =
@ -210,12 +204,6 @@ parseSimCommand ("maxsize":repo:size:[]) =
parseSimCommand ("rebalance":onoff:[]) = case isTrueFalse onoff of
Just b -> Right $ CommandRebalance b
Nothing -> Left $ "Unable to parse rebalance value \"" ++ onoff ++ "\""
parseSimCommand ("initcluster":name:[]) =
Right $ CommandInitCluster (RepoName name)
parseSimCommand ("addcluster":name:nodes) =
Right $ CommandAddCluster (RepoName name) (map RemoteName nodes)
parseSimCommand ("removecluster":name:node:[]) =
Right $ CommandRemoveCluster (RepoName name) (RemoteName node)
parseSimCommand ("visit":repo:cmdparams) =
Right $ CommandVisit (RepoName repo) cmdparams
parseSimCommand ws = parseError ws