Revision 9d049fb4
b/src/Ganeti/HTools/CLI.hs | ||
---|---|---|
443 | 443 |
OptComplFile) |
444 | 444 |
|
445 | 445 |
oLuxiSocket :: IO OptType |
446 |
oLuxiSocket = liftM genOLuxiSocket Path.defaultLuxiSocket
|
|
446 |
oLuxiSocket = liftM genOLuxiSocket Path.defaultMasterSocket
|
|
447 | 447 |
|
448 | 448 |
oMachineReadable :: OptType |
449 | 449 |
oMachineReadable = |
b/src/Ganeti/HTools/Program/Harep.hs | ||
---|---|---|
453 | 453 |
unless (null args) $ |
454 | 454 |
exitErr "this program doesn't take any arguments." |
455 | 455 |
|
456 |
luxiDef <- Path.defaultLuxiSocket
|
|
456 |
luxiDef <- Path.defaultMasterSocket
|
|
457 | 457 |
let master = fromMaybe luxiDef $ optLuxi opts |
458 | 458 |
opts' = opts { optLuxi = Just master } |
459 | 459 |
|
b/src/Ganeti/HTools/Program/Hscan.hs | ||
---|---|---|
150 | 150 |
"t_disk" "f_disk" "Score" |
151 | 151 |
|
152 | 152 |
when (null clusters) $ do |
153 |
def_socket <- Path.defaultLuxiSocket
|
|
153 |
def_socket <- Path.defaultMasterSocket
|
|
154 | 154 |
let lsock = fromMaybe def_socket (optLuxi opts) |
155 | 155 |
let name = local |
156 | 156 |
input_data <- Luxi.loadData lsock |
b/src/Ganeti/Path.hs | ||
---|---|---|
28 | 28 |
, runDir |
29 | 29 |
, logDir |
30 | 30 |
, socketDir |
31 |
, defaultLuxiSocket
|
|
31 |
, defaultMasterSocket
|
|
32 | 32 |
, defaultQuerySocket |
33 | 33 |
, confdHmacKey |
34 | 34 |
, clusterConfFile |
... | ... | |
84 | 84 |
socketDir :: IO FilePath |
85 | 85 |
socketDir = runDir `pjoin` "socket" |
86 | 86 |
|
87 |
-- | The default LUXI socket path.
|
|
88 |
defaultLuxiSocket :: IO FilePath
|
|
89 |
defaultLuxiSocket = socketDir `pjoin` "ganeti-master"
|
|
87 |
-- | The default path for the master-daemon LUXI socket.
|
|
88 |
defaultMasterSocket :: IO FilePath
|
|
89 |
defaultMasterSocket = socketDir `pjoin` "ganeti-master"
|
|
90 | 90 |
|
91 | 91 |
-- | The default LUXI socket for queries. |
92 | 92 |
defaultQuerySocket :: IO FilePath |
b/src/Ganeti/Query/Server.hs | ||
---|---|---|
57 | 57 |
import Ganeti.Luxi |
58 | 58 |
import qualified Ganeti.Query.Language as Qlang |
59 | 59 |
import qualified Ganeti.Query.Cluster as QCluster |
60 |
import Ganeti.Path (queueDir, jobQueueLockFile, defaultLuxiSocket)
|
|
60 |
import Ganeti.Path (queueDir, jobQueueLockFile, defaultMasterSocket)
|
|
61 | 61 |
import Ganeti.Query.Query |
62 | 62 |
import Ganeti.Query.Filter (makeSimpleFilter) |
63 | 63 |
import Ganeti.Types |
... | ... | |
210 | 210 |
case write_result of |
211 | 211 |
Bad s -> return . Bad . GenericError $ s |
212 | 212 |
Ok () -> do |
213 |
socketpath <- defaultLuxiSocket
|
|
213 |
socketpath <- defaultMasterSocket
|
|
214 | 214 |
client <- getClient socketpath |
215 | 215 |
pickupResult <- callMethod (PickupJob jid) client |
216 | 216 |
closeClient client |
... | ... | |
244 | 244 |
succeeded = map snd $ filter (isOk . fst) annotated_results |
245 | 245 |
when (any isBad write_results) . logWarning |
246 | 246 |
$ "Writing some jobs failed " ++ show annotated_results |
247 |
socketpath <- defaultLuxiSocket
|
|
247 |
socketpath <- defaultMasterSocket
|
|
248 | 248 |
client <- getClient socketpath |
249 | 249 |
pickupResults <- mapM (flip callMethod client . PickupJob) |
250 | 250 |
succeeded |
Also available in: Unified diff