New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make joyent-minimal brand more flexible #339

Closed
wants to merge 1 commit into
base: master
from

Conversation

Projects
None yet
2 participants
@nshalman
Contributor

nshalman commented Aug 13, 2014

fixes #118

joyent-minimal and joyent brands now share the
/zones/manifests/joyent lofs mount

This is safe because the minimal brand overwrites the SMF repository of
whatever image is being used with its own minimal seed repository which
disables early-manifest-import and manifest-import

This change allows a joyent-minimal zone to import any other service
available to the joyent brand without maintaining a complicated brand
manifests file

nshalman added a commit to nshalman/imagetools that referenced this pull request Aug 13, 2014

match build_database function in smartos-live
joyent/smartos-live#339 alters the build_database function
which was copied into create-smf-repo

This commit keeps the two versions in sync
@nshalman

This comment has been minimized.

Contributor

nshalman commented Aug 15, 2014

I ran the test suite and found no new failures. I think we should be good to go.
Details below.

Summary of testing on unmodified SmartOS (SunOS router-spare 5.11 joyent_20140807T193112Z i86pc i386 i86pc):

#  TEST COMPLETE IN 1699 SECONDS, SUMMARY:
#
# PASS: 2488 / 2514
# FAIL: 26 / 2514
#
#  ** FAILED TESTS **
#  /usr/vm/test/tests/test-vrrp-nics.js
#  /usr/vm/test/tests/test-spoof-opts.js
#  /usr/vm/test/tests/test-invalid-nic-tags.js
#

Summary of testing on SmartOS with this patch applied (SunOS router-spare 5.11 joyent_20140814T200205Z i86pc i386 i86pc):

#  TEST COMPLETE IN 1642 SECONDS, SUMMARY:
#
# PASS: 2488 / 2514
# FAIL: 26 / 2514
#
#  ** FAILED TESTS **
#  /usr/vm/test/tests/test-vrrp-nics.js
#  /usr/vm/test/tests/test-spoof-opts.js
#  /usr/vm/test/tests/test-invalid-nic-tags.js
#

Summary of failures (identical on both...):

[root@router-spare /zones]# cat vanilla-tests-stdout.txt modified-tests-stdout.txt | egrep "^not ok" | sort | uniq -c
   2 not ok 11 Error: Command failed: unknown_fstyp (partition not found) unknown_fstyp (partition not found) umount: warning: /mnt/usbkey not in mnttab umount: /mnt/usbkey no such file or directory
   2 not ok 11 net0 allowed-ips
   2 not ok 113 net2: allowed-ips after reboot
   2 not ok 12 Error: Command failed: unknown_fstyp (partition not found) unknown_fstyp (partition not found) umount: warning: /mnt/usbkey not in mnttab umount: /mnt/usbkey no such file or directory
   2 not ok 13 Command failed: unknown_fstyp (partition not found) unknown_fstyp (partition not found) umount: warning: /mnt/usbkey not in mnttab umount: /mnt/usbkey no such file or directory
   2 not ok 13 net1 allowed-ips
   2 not ok 152 net1: allowed-ips set to assigned IP
   2 not ok 154 net0: allowed-ips set to assigned IP
   2 not ok 156 net2: allowed-ips set to assigned IP
   2 not ok 17 Error: Command failed: unknown_fstyp (partition not found) unknown_fstyp (partition not found) umount: warning: /mnt/usbkey not in mnttab umount: /mnt/usbkey no such file or directory
   2 not ok 18 reset nic tags: Command failed: unknown_fstyp (partition not found) unknown_fstyp (partition not found) umount: warning: /mnt/usbkey not in mnttab umount: /mnt/usbkey no such file or directory
   2 not ok 187 net2: allowed-ips after first update
   2 not ok 208 net2: allowed-ips after net1 update
   2 not ok 237 net2: allowed-ips after reboot
   2 not ok 276 net1: allowed-ips set to assigned IP
   2 not ok 278 net0: allowed-ips set to assigned IP
   2 not ok 28 net1: allowed-ips set to assigned IP
   2 not ok 280 net2: allowed-ips set to assigned IP
   2 not ok 30 net0: allowed-ips set to assigned IP
   2 not ok 311 net2: allowed-ips after first update
   2 not ok 32 net2: allowed-ips set to assigned IP
   2 not ok 332 net2: allowed-ips after net1 update
   2 not ok 361 net2: allowed-ips after reboot
   2 not ok 55 net0 allowed-ips
   2 not ok 63 net2: allowed-ips after first update
   2 not ok 84 net2: allowed-ips after net1 update
@nshalman

This comment has been minimized.

Contributor

nshalman commented Aug 15, 2014

Full vanilla test run output is here in case anyone wants to take a look at the failure details:
http://us-east.manta.joyent.com/nahamu/public/smartos/smartos-test-failures-on-joyent_20140807T193112Z.txt

(I recommend running mget /nahamu/public/smartos/smartos-test-failures-on-joyent_20140807T193112Z.txt | less -R so that it looks pretty...)

@nshalman

This comment has been minimized.

Contributor

nshalman commented Aug 15, 2014

After merging in OS-3338 I now only get 4 failures (they are presumably still unrelated, but in case @rgulewich want's to take a look...):

#  TEST COMPLETE IN 1748 SECONDS, SUMMARY:
#
# PASS: 2579 / 2583
# FAIL: 4 / 2583
#
#  ** FAILED TESTS **
#  /usr/vm/test/tests/test-invalid-nic-tags.js
#
[root@router-spare ~]# cat /zones/modified-tests-OS-3338-stdout.txt | awk '/^not ok/,/^ok/{print}'
not ok 7 error creating VM: Conflict detected with another vm, please check the MAC, IP, and VRID
  ---
    type:    AssertionError
    message: error creating VM: Conflict detected with another vm, please check the MAC, IP, and VRID
    code:    ~
    errno:   ~
    stack:   
      - /usr/vm/test/common/vmtest.js:42:27
      - /usr/vm/node_modules/VM.js:7955:9
      - /usr/node/0.10/node_modules/async.js:529:30
      - /usr/vm/node_modules/VM.js:7919:17
      - /usr/vm/node_modules/VM.js:6667:17
      - /usr/vm/node_modules/VM.js:3942:9
      - /usr/node/0.10/node_modules/async.js:240:13
      - /usr/node/0.10/node_modules/async.js:144:21
      - /usr/node/0.10/node_modules/async.js:237:17
    wanted:  true
    found:   false
  ...
not ok 8 Conflict detected with another vm, please check the MAC, IP, and VRID
  ---
    type:    AssertionError
    message: Conflict detected with another vm, please check the MAC, IP, and VRID
    code:    ~
    errno:   ~
    stack:   
      - /usr/vm/test/common/vmtest.js:88:15
      - /usr/node/0.10/node_modules/async.js:240:13
      - /usr/node/0.10/node_modules/async.js:144:21
      - /usr/node/0.10/node_modules/async.js:237:17
      - /usr/node/0.10/node_modules/async.js:600:34
      - /usr/vm/test/common/vmtest.js:43:25
      - /usr/vm/node_modules/VM.js:7955:9
      - /usr/node/0.10/node_modules/async.js:529:30
      - /usr/vm/node_modules/VM.js:7919:17
    wanted:  true
    found:   false
  ...
ok 9 (unnamed assert)
not ok 11 Error: Command failed: Error: nic tag 'new_tag1' is in use
  ---
    type:    Error
    message: Command failed: Error: nic tag 'new_tag1' is in use
    code:    ~
    errno:   ~
    file:    child_process.js
    line:    637
    column:  15
    stack:   
      - 
      - ChildProcess.exithandler (child_process.js:637:15)
      - ChildProcess.EventEmitter.emit (events.js:98:17)
      - maybeClose (child_process.js:743:16)
      - Socket.<anonymous> (child_process.js:956:11)
      - Socket.EventEmitter.emit (events.js:95:17)
      - Pipe.close (net.js:468:12)
    wanted:  ~
    found:   ~
  ...
not ok 12 reset nic tags: Command failed: Error: nic tag 'new_tag1' is in use
  ---
    type:    AssertionError
    message: reset nic tags: Command failed: Error: nic tag 'new_tag1' is in use
    code:    ~
    errno:   ~
    file:    /usr/vm/node_modules/nodeunit-plus/index.js
    line:    91
    column:  31
    stack:   
      - 
      - Object.notOk (/usr/vm/node_modules/nodeunit-plus/index.js:91:31)
      - /usr/vm/test/tests/test-invalid-nic-tags.js:343:23
      - /usr/node/0.10/node_modules/async.js:144:21
      - /usr/vm/test/tests/test-invalid-nic-tags.js:179:28
      - ChildProcess.exithandler (child_process.js:641:7)
      - ChildProcess.EventEmitter.emit (events.js:98:17)
      - maybeClose (child_process.js:743:16)
      - Socket.<anonymous> (child_process.js:956:11)
      - Socket.EventEmitter.emit (events.js:95:17)
    wanted:  true
    found:   false
  ...
# create etherstub
ok 13 (unnamed assert)
@nshalman

This comment has been minimized.

Contributor

nshalman commented Dec 11, 2014

I built the SDC platform image with this patch applied, and then used that to assemble a headnode usb image.

I booted that headnode image and did an install and everything seems pretty happy.

[root@headnode (testing) ~]# uname -a
SunOS headnode 5.11 joyent_20141211T160249Z i86pc i386 i86pc
[root@headnode (testing) ~]# ls -l /zones/manifests/
total 3
drwxr-xr-x   7 root     root           7 Dec 11 20:17 joyent
[root@headnode (testing) ~]# sdc-healthcheck 
ZONE                                 STATE           AGENT               STATUS
global                               running         -                   online
assets                               running         -                   online
sapi                                 running         -                   online
binder                               running         -                   online
manatee                              running         -                   online
moray                                running         -                   online
amonredis                            running         -                   online
redis                                running         -                   online
ufds                                 running         -                   online
workflow                             running         -                   online
amon                                 running         -                   online
sdc                                  running         -                   online
papi                                 running         -                   online
napi                                 running         -                   online
rabbitmq                             running         -                   online
imgapi                               running         -                   online
cnapi                                running         -                   online
dhcpd                                running         -                   online
fwapi                                running         -                   online
vmapi                                running         -                   online
ca                                   running         -                   online
mahi                                 running         -                   online
adminui                              running         -                   online
global                               running         provisioner         online
global                               running         heartbeat           online
global                               running         ur                  online
global                               running         smartlogin          online
[root@headnode (testing) ~]# svcs -xZ
[root@headnode (testing) ~]# 
@nshalman

This comment has been minimized.

Contributor

nshalman commented May 4, 2015

I followed https://blog.shalman.org/running-sdc-coal-on-smartos/ but before booting I replaced the platform with my own platform including both this change and the Delphix vioif change (see joyent/sdc-manta#2 for a necessary workaround to get CoaL to cooperate with vioif).

I was able to get SDC and Manta installed.
I was able to put and get an object and run a job over it.
I also installed madtom and it showed everything was green.

Does that count as enough testing for this change?

#339 make joyent-minimal brand more flexible
#118 adding some services to joyent-minimal (not enabled or imported by default)

@rmustacc rmustacc self-assigned this May 29, 2015

rmustacc added a commit that referenced this pull request May 29, 2015

#339 make joyent-minimal brand more flexible
#118 adding some services to joyent-minimal (not enabled or imported by default)
@rmustacc

This comment has been minimized.

Member

rmustacc commented May 29, 2015

Resolved in 7d0701f.

@rmustacc rmustacc closed this May 29, 2015

@nshalman nshalman deleted the nshalman:issue118-v2 branch May 29, 2015

@nshalman

This comment has been minimized.

Contributor

nshalman commented May 29, 2015

Thanks @rmustacc!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment