@@ -219,21 +219,21 @@ func (d *Driver) startServiceVMIfNotRunning(id string, mvdToAdd []hcsshim.Mapped
219219 // Use the global ID if in global mode
220220 id = d .getVMID (id )
221221
222- title := fmt . Sprintf ( "lcowdriver: startservicevmifnotrunning %s:" , id )
222+ title := "lcowdriver: startServiceVMIfNotRunning " + id
223223
224224 // Attempt to add ID to the service vm map
225- logrus .Debugf ("%s: Adding entry to service vm map" , title )
225+ logrus .Debugf ("%s: adding entry to service vm map" , title )
226226 svm , exists , err := d .serviceVms .add (id )
227227 if err != nil && err == errVMisTerminating {
228228 // VM is in the process of terminating. Wait until it's done and and then try again
229- logrus .Debugf ("%s: VM with current ID still in the process of terminating: %s " , title , id )
229+ logrus .Debugf ("%s: VM with current ID still in the process of terminating" , title )
230230 if err := svm .getStopError (); err != nil {
231- logrus .Debugf ("%s: VM %s did not stop successfully: %s" , title , id , err )
231+ logrus .Debugf ("%s: VM did not stop successfully: %s" , title , err )
232232 return nil , err
233233 }
234234 return d .startServiceVMIfNotRunning (id , mvdToAdd , context )
235235 } else if err != nil {
236- logrus .Debugf ("%s: failed to add service vm to map: %s" , err )
236+ logrus .Debugf ("%s: failed to add service vm to map: %s" , title , err )
237237 return nil , fmt .Errorf ("%s: failed to add to service vm map: %s" , title , err )
238238 }
239239
@@ -248,7 +248,7 @@ func (d *Driver) startServiceVMIfNotRunning(id string, mvdToAdd []hcsshim.Mapped
248248 }
249249
250250 // We are the first service for this id, so we need to start it
251- logrus .Debugf ("%s: service vm doesn't exist. Now starting it up: %s " , title , id )
251+ logrus .Debugf ("%s: service vm doesn't exist. Now starting it up" , title )
252252
253253 defer func () {
254254 // Signal that start has finished, passing in the error if any.
@@ -261,7 +261,7 @@ func (d *Driver) startServiceVMIfNotRunning(id string, mvdToAdd []hcsshim.Mapped
261261
262262 // Generate a default configuration
263263 if err := svm .config .GenerateDefault (d .options ); err != nil {
264- return nil , fmt .Errorf ("%s failed to generate default gogcs configuration for global svm (%s): %s" , title , context , err )
264+ return nil , fmt .Errorf ("%s: failed to generate default gogcs configuration for global svm (%s): %s" , title , context , err )
265265 }
266266
267267 // For the name, we deliberately suffix if safe-mode to ensure that it doesn't
@@ -277,19 +277,19 @@ func (d *Driver) startServiceVMIfNotRunning(id string, mvdToAdd []hcsshim.Mapped
277277 // and not in the process of being created by another thread.
278278 scratchTargetFile := filepath .Join (d .dataRoot , scratchDirectory , fmt .Sprintf ("%s.vhdx" , id ))
279279
280- logrus .Debugf ("%s locking cachedScratchMutex" , title )
280+ logrus .Debugf ("%s: locking cachedScratchMutex" , title )
281281 d .cachedScratchMutex .Lock ()
282282 if _ , err := os .Stat (d .cachedScratchFile ); err == nil {
283283 // Make a copy of cached scratch to the scratch directory
284- logrus .Debugf ("lcowdriver: startServiceVmIfNotRunning: (%s) cloning cached scratch for mvd" , context )
284+ logrus .Debugf ("%s: (%s) cloning cached scratch for mvd" , title , context )
285285 if err := client .CopyFile (d .cachedScratchFile , scratchTargetFile , true ); err != nil {
286- logrus .Debugf ("%s releasing cachedScratchMutex on err: %s" , title , err )
286+ logrus .Debugf ("%s: releasing cachedScratchMutex on err: %s" , title , err )
287287 d .cachedScratchMutex .Unlock ()
288288 return nil , err
289289 }
290290
291291 // Add the cached clone as a mapped virtual disk
292- logrus .Debugf ("lcowdriver: startServiceVmIfNotRunning: (%s) adding cloned scratch as mvd" , context )
292+ logrus .Debugf ("%s: (%s) adding cloned scratch as mvd" , title , context )
293293 mvd := hcsshim.MappedVirtualDisk {
294294 HostPath : scratchTargetFile ,
295295 ContainerPath : toolsScratchPath ,
@@ -299,7 +299,7 @@ func (d *Driver) startServiceVMIfNotRunning(id string, mvdToAdd []hcsshim.Mapped
299299 svm .scratchAttached = true
300300 }
301301
302- logrus .Debugf ("%s releasing cachedScratchMutex" , title )
302+ logrus .Debugf ("%s: releasing cachedScratchMutex" , title )
303303 d .cachedScratchMutex .Unlock ()
304304
305305 // If requested to start it with a mapped virtual disk, add it now.
@@ -309,39 +309,39 @@ func (d *Driver) startServiceVMIfNotRunning(id string, mvdToAdd []hcsshim.Mapped
309309 }
310310
311311 // Start it.
312- logrus .Debugf ("lcowdriver: startServiceVmIfNotRunning: (%s) starting %s" , context , svm .config .Name )
312+ logrus .Debugf ("%s: (%s) starting %s" , title , context , svm .config .Name )
313313 if err := svm .config .StartUtilityVM (); err != nil {
314314 return nil , fmt .Errorf ("failed to start service utility VM (%s): %s" , context , err )
315315 }
316316
317317 // defer function to terminate the VM if the next steps fail
318318 defer func () {
319319 if err != nil {
320- waitTerminate (svm , fmt .Sprintf ("startServiceVmIfNotRunning: %s (%s)" , id , context ))
320+ waitTerminate (svm , fmt .Sprintf ("%s: (%s)" , title , context ))
321321 }
322322 }()
323323
324324 // Now we have a running service VM, we can create the cached scratch file if it doesn't exist.
325- logrus .Debugf ("%s locking cachedScratchMutex" , title )
325+ logrus .Debugf ("%s: locking cachedScratchMutex" , title )
326326 d .cachedScratchMutex .Lock ()
327327 if _ , err := os .Stat (d .cachedScratchFile ); err != nil {
328- logrus .Debugf ("%s (%s): creating an SVM scratch" , title , context )
328+ logrus .Debugf ("%s: (%s) creating an SVM scratch" , title , context )
329329
330330 // Don't use svm.CreateExt4Vhdx since that only works when the service vm is setup,
331331 // but we're still in that process right now.
332332 if err := svm .config .CreateExt4Vhdx (scratchTargetFile , client .DefaultVhdxSizeGB , d .cachedScratchFile ); err != nil {
333- logrus .Debugf ("%s (%s): releasing cachedScratchMutex on error path" , title , context )
333+ logrus .Debugf ("%s: (%s) releasing cachedScratchMutex on error path" , title , context )
334334 d .cachedScratchMutex .Unlock ()
335335 logrus .Debugf ("%s: failed to create vm scratch %s: %s" , title , scratchTargetFile , err )
336336 return nil , fmt .Errorf ("failed to create SVM scratch VHDX (%s): %s" , context , err )
337337 }
338338 }
339- logrus .Debugf ("%s (%s): releasing cachedScratchMutex" , title , context )
339+ logrus .Debugf ("%s: (%s) releasing cachedScratchMutex" , title , context )
340340 d .cachedScratchMutex .Unlock ()
341341
342342 // Hot-add the scratch-space if not already attached
343343 if ! svm .scratchAttached {
344- logrus .Debugf ("lcowdriver: startServiceVmIfNotRunning: (%s) hot-adding scratch %s" , context , scratchTargetFile )
344+ logrus .Debugf ("%s: (%s) hot-adding scratch %s" , title , context , scratchTargetFile )
345345 if err := svm .hotAddVHDsAtStart (hcsshim.MappedVirtualDisk {
346346 HostPath : scratchTargetFile ,
347347 ContainerPath : toolsScratchPath ,
@@ -353,7 +353,7 @@ func (d *Driver) startServiceVMIfNotRunning(id string, mvdToAdd []hcsshim.Mapped
353353 svm .scratchAttached = true
354354 }
355355
356- logrus .Debugf ("lcowdriver: startServiceVmIfNotRunning: (%s) success" , context )
356+ logrus .Debugf ("%s: (%s) success" , title , context )
357357 return svm , nil
358358}
359359
0 commit comments