[specific ci=Group11-Upgrade] Reconfigure VM display name #4134

chengwang86 · 2017-03-02T21:23:00Z

This PR is the first step for docker rename support.

added ExecutorConfigCommon in container_vm.go with the property of "name" setting to "hidden", so that the containerVM's common/name could be persisted to the vmx file while the user performs docker rename on a running containerVM
/etc/hosts does not contain containerName anymore since common/name is set to "hidden". Therefore, we don't need to update /etc/hosts while renaming a container. This will solve tether should update (instead of appending) containerName in /etc/hosts after changing the VM name in guestinfo #4075
when creating the containerVM, set the VM display name to containerName-containerShortID and datastore folder name to containerID for non-vsan setup, and set both names to containerName-containerShortID for vsan setup
Updated all the relevant test cases where the containerVM's display name does not match with the new naming convention
added a test case in 1-04-Docker-Create.robot: After creating a container, check that the VM displayname=containerName-shortID and datatstore folder name=containerID
added a plugin for VCH upgrade since we changed the scope of common.name of the VCH
added a plugin for containerVM data migration since we changed the scope of common.name of containerVMs (relies on Migrate container configuration in portlayer in memory #4146 )
in vicadmin, obtain the VCH name from vsphere instead of from within the VCH (since the VCH hostname is hidden)

sgairo · 2017-03-06T18:16:03Z

lib/config/executor/container_vm.go

@@ -44,6 +44,21 @@ type Common struct {
 	Notes string `vic:"0.1" scope:"hidden" key:"notes"`
 }

+// Common data (specifically for a containerVM) between managed entities, across execution environments.
+type Common2 struct {


What is the thought process behind naming this Common2, I just want to be sure that there isn't a better or more appropriate name for this.

@sgairo We want to persist the name in Common while the containeVM is still running, so we need to set the property of name to hidden. In order not to mess up with the original Common which might require read-only name by other objects, we create common2 instead.

emlin · 2017-03-08T15:57:13Z

lib/install/management/delete.go

 			continue
 		}
+		if err != nil {
+			errs = append(errs, err.Error())


if error happens, we should continue to avoid delete vch by mistake

emlin · 2017-03-08T15:58:28Z

lib/migration/migrator_test.go

@@ -34,10 +36,10 @@ func setUp() {
 	// register sample plugin into test
 	log.SetLevel(log.DebugLevel)
 	trace.Logger.Level = log.DebugLevel
-	version.MaxPluginVersion = 1
+	version.MaxPluginVersion = 4


version.MaxPluginVersion = version.MaxPluginVersion + 1

emlin · 2017-03-08T16:00:37Z

lib/migration/samples/plugins/plugin1/stop_signal_rename_sample.go

@@ -31,7 +31,7 @@ import (
 // If only a couple of items changed in the configuration, you don't have to copy all VirtualContainerHost. Only define the few items used by
 // this upgrade plugin will simplify the extraconfig encoding/decoding process
 const (
-	version = 1
+	version = 4


why do you need to change this?

@emlin No need to do this. I will fix it.

emlin · 2017-03-08T16:05:12Z

lib/migration/plugins/init.go

+import (
+	_ "github.com/vmware/vic/pkg/version/plugin2"
+	_ "github.com/vmware/vic/pkg/version/plugin3"
+)


add new line

plugin sounds really bad, IMHO this should be migrator

hmm.. migrator is good, but I have used that in another place. 😢

then lets rename all in a separate PR :)

gonna need a new name for the original migrator as well

emlin · 2017-03-08T16:11:59Z

lib/portlayer/exec/container.go

+	}
+
+	fullName := fmt.Sprintf("%s-%s", prettyName, shortID)
+	task, err := c.vm.VirtualMachine.Rename(ctx, fullName)


using vm.WaitForResult method, that will retry for TaskInProgress error

emlin · 2017-03-08T16:13:33Z

lib/portlayer/exec/container.go

@@ -35,6 +35,7 @@ import (
 	"github.com/vmware/vic/pkg/vsphere/vm"

 	log "github.com/Sirupsen/logrus"
+	"github.com/docker/docker/pkg/stringid"


Should we have portlayer rely on docker package?

You are right. I will remove this from portlayer.

emlin · 2017-03-08T16:17:48Z

lib/vicadmin/validate.go

+	self2 := vm.NewVirtualMachineFromVM(ctx, sess, self)
+	vchName, err = self2.Name(ctx)
+	if err != nil {
+		log.Infof("Unable to get VCH name: %s", err)


if err != nil, vchname will be ""

@emlin No, it will be VCH instead of "".

How? You have reset vchName at line 226

I think it will be "". In any case you should return an error from this function if err != nil.

if err != nil {
vchName = defaultVchName
...
}

I think it's fine not to return err since the original cod just attempts to get a name and if not present, then just set to "VCH"

emlin · 2017-03-08T16:19:39Z

pkg/version/plugin2/commonSpecForVCH.go

+	Notes string `vic:"0.1" scope:"hidden" key:"notes"`
+}
+
+type NewVirtualContainerHostConfigSpec struct {


this looks like the method name to create struct VirtualContainerHostConfigSpec

- update test cases with checking for datastore_type

- pass specconfig as argument to util.DisplayName() - panic when data migration fails

The Name field was changed to be hidden from the guest in vmware#4134 to support docker rename. This was a compromise needed due to an ESX vigor bug, see vmware#5533. This *requires* that users be on a version of ESX that has the fix or bad things may happen to cVM configurations. I have not tracked down what build versions that entails and have not code a check mechanism. This change has the effect of the hostname of the VCH endpointVM being set to the name of the VCH. It also allows additional live reconfiguration such as hotadd to a bridge network, in general modification of all container configuration live is possible, if not necessarily applied.

vmwclabot added the cla-not-required label Mar 2, 2017

chengwang86 force-pushed the cheng-vmreconfig-3972 branch from e6f2118 to 8e94fc7 Compare March 2, 2017 21:40

chengwang86 changed the title ~~[full ci] WIP: VM reconfiguration right after creation~~ [specific ci=8-02-OOB-VM-Register] WIP: VM reconfiguration right after creation Mar 3, 2017

chengwang86 force-pushed the cheng-vmreconfig-3972 branch from 9304605 to d434e9a Compare March 3, 2017 04:24

chengwang86 changed the title ~~[specific ci=8-02-OOB-VM-Register] WIP: VM reconfiguration right after creation~~ [specific ci=Group6-VIC-Machine] WIP: VM reconfiguration right after creation Mar 3, 2017

chengwang86 changed the title ~~[specific ci=Group6-VIC-Machine] WIP: VM reconfiguration right after creation~~ [specific ci=Group12-VCH-BC] WIP: VM reconfiguration right after creation Mar 3, 2017

chengwang86 changed the title ~~[specific ci=Group12-VCH-BC] WIP: VM reconfiguration right after creation~~ [specific ci=Group9-VIC-Admin] WIP: VM reconfiguration right after creation Mar 6, 2017

sgairo reviewed Mar 6, 2017

View reviewed changes

chengwang86 changed the title ~~[specific ci=Group9-VIC-Admin] WIP: VM reconfiguration right after creation~~ [specific ci=Group9-VIC-Admin] WIP: Reconfigure VM display name Mar 6, 2017

chengwang86 force-pushed the cheng-vmreconfig-3972 branch from 01e4a80 to 7357a7c Compare March 6, 2017 19:27

chengwang86 changed the title ~~[specific ci=Group9-VIC-Admin] WIP: Reconfigure VM display name~~ [specific ci=Group11-Upgrade] WIP: Reconfigure VM display name Mar 6, 2017

chengwang86 force-pushed the cheng-vmreconfig-3972 branch from fbc5a09 to 2303f95 Compare March 7, 2017 16:36

chengwang86 changed the title ~~[specific ci=Group11-Upgrade] WIP: Reconfigure VM display name~~ [full ci] WIP: Reconfigure VM display name Mar 8, 2017

chengwang86 force-pushed the cheng-vmreconfig-3972 branch from 2303f95 to 9b4229a Compare March 8, 2017 03:33

chengwang86 changed the title ~~[full ci] WIP: Reconfigure VM display name~~ [full ci] Reconfigure VM display name Mar 8, 2017

chengwang86 requested review from caglar10ur, emlin, sflxn, gigawhitlocks, hickeng, hmahmood and mhagen-vmware March 8, 2017 14:49

emlin reviewed Mar 8, 2017

View reviewed changes

chengwang86 added 22 commits March 23, 2017 13:08

cosmetic changes

65a75f7

add plugins

4acae52

remove unnecessary comments and update test case

175d278

update upgrade test

8b595bf

update test case 11-01

f0491e4

cosmetic change

e3b186e

correct typo

e395ab6

- set log bundle name of containerVMs to the display name

e27d600

- update test cases with checking for datastore_type

correct errors in test cases

b2790bb

update code repo

6616805

use session.isVSAN() to check whether it is a vsan setup

bc7f544

update exec_test.go

df19841

cosmetic changees

3370e0e

cosmetic change

f2c7a48

update tests and the method for obtaining VCH name in vicadmin

cd20d16

remove VSAN checking from logging.go

2f1ff70

cosmetic change

7f80e50

cosmetic change

456f991

- update test case 9-01

5866e27

- pass specconfig as argument to util.DisplayName() - panic when data migration fails

move plugins from pkg to lib/migration/plugins/

9ffcb32

cosmetic changes

ddc4363

cosmetic change

607b057

chengwang86 force-pushed the cheng-vmreconfig-3972 branch from 4ffb067 to 607b057 Compare March 23, 2017 20:09

chengwang86 merged commit 27186d0 into vmware:master Mar 23, 2017

This was referenced Mar 24, 2017

Portlets are broken (related to #4134) #4383

Closed

Fix broken portlets #4386

Merged

chengwang86 mentioned this pull request Mar 26, 2017

tether should update (instead of appending) containerName in /etc/hosts after changing the VM name in guestinfo #4075

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[specific ci=Group11-Upgrade] Reconfigure VM display name #4134

[specific ci=Group11-Upgrade] Reconfigure VM display name #4134

chengwang86 commented Mar 2, 2017 •

edited

Loading

sgairo Mar 6, 2017

chengwang86 Mar 6, 2017

emlin Mar 8, 2017

emlin Mar 8, 2017

emlin Mar 8, 2017

chengwang86 Mar 8, 2017

emlin Mar 8, 2017

caglar10ur Mar 16, 2017

emlin Mar 21, 2017

caglar10ur Mar 22, 2017

emlin Mar 22, 2017

emlin Mar 8, 2017

emlin Mar 8, 2017

chengwang86 Mar 8, 2017

emlin Mar 8, 2017

chengwang86 Mar 8, 2017

emlin Mar 8, 2017

hmahmood Mar 8, 2017

sflxn Mar 9, 2017

emlin Mar 8, 2017

[specific ci=Group11-Upgrade] Reconfigure VM display name #4134

[specific ci=Group11-Upgrade] Reconfigure VM display name #4134

Conversation

chengwang86 commented Mar 2, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chengwang86 commented Mar 2, 2017 •

edited

Loading