----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/12972/#review24026 -----------------------------------------------------------
Ship it! Here's how I tested this: Reverted Sheng's revert which reincluded vm_data.sh (3b39fb04421424ebb1485c2a046708bb3661cd4c) and deployed devcloud2 which runs Xen underneath. Deployed server, started up systemVMs and ran the userdata tests: $ nosetests --with-marvin --marvin-config=setup/dev/advanced.cfg test/integration/smoke/test_deploy_vm_with_userdata.py --load Test userdata as GET, size > 2k ... ERROR Test userdata as POST, size > 2k ... ERROR They both failed to find the vm_data.sh script when applying userdata /var/log/SMlog within devcloud2 shows the plugin failing to find the script [8147] 2013-07-27 12:13:34.576201 vmdata failed with folder: metadata and file: cloud-identifier [8147] 2013-07-27 12:13:34.576680 ['/bin/bash', '/usr/lib/xcp/bin/vm_data.sh', '-r', '169.254.2.157', '-v', '192.168.56.165', '-F', 'metadata', '-f', 'instance-id', '-d', '/tmp/tmpKDBarR'] [8147] 2013-07-27 12:13:34.584365 FAILED: (rc 127) stdout: '', stderr: '/bin/bash: /usr/lib/xcp/bin/vm_data.sh: No such file or directory Then applied the patch here for CitrixResourceBase.java and redeployed devcloud2 and re-ran the userdata tests This time they passed $ nosetests --with-marvin --marvin-config=setup/dev/advanced.cfg test/integration/smoke/test_deploy_vm_with_userdata.py --load Test userdata as GET, size > 2k ... ok Test userdata as POST, size > 2k ... ok ---------------------------------------------------------------------- Ran 2 tests in 96.547s OK Plugin was found and sent userdata via vmdata_kvm.py [8958] 2013-07-27 12:55:25.961498 #### VMOPS enter routerProxy #### [8958] 2013-07-27 12:55:25.962499 ['/bin/bash', '/usr/lib/xcp/bin/router_proxy.sh', 'vmdata_kvm.py', '169.254.2.238', '-d', 'eyIxOTIuMTY4LjU2LjE0NiI6W1sidXNlcmRhdGEiLCJ1c2VyLWRhdGEiLCJNRm94TjFneFREZFhSVkpDVmpoSldGTkdXakExV0RORlFrMVhOelZOVUVjd01WbzJXRUpVVFRnNE56VlNUbEZNVWpoS04waERNVVUzT1U0MFJ6TllVVEpRUWtvd1N6QXhPRGxHVWxSWVREYzBRemRGU1VNMFdGRkpTa1ZMU2t0SVIxVTNXazVMVVZSTFEwNHpWRXRDTlRGWE9EQlVOa1ZDTWtKQldrb3lUekpGTTBsRlZrdEZTVXRMVXpSQ01raFdVemhZT1RCUU5sQk5RVFpHUTFOWk1rbzNWVUpaUWtVeU1USTVSMVpNVTAxUFNWQlhXamRPVms1R1UxbFpWekZVUjBKSFRVdEhUakZWU0RaRVNVUlhRa0ZGVUROT1NqaElVRGRaTWpKUVNUUTVSbFU1TVRCTVJqUklURmxIU3pSSVVEY3lORm8zV2xGQ1NUY3hWRFF4UVVwTVNFZENTMWxCTlZKVk1rWkdNRWhTUjBNMVNsbEZTVEphTmtrNFRqWllUMFpQVURkR1RrdEtVamszVEU0NFRrNDFWemRSV1VWVFVrczFPRVV3VWpJME5WTktUVXRXTjFwRU1FNDJWRmhFU0U5SFQweFpSVFJEVWtsVE0wOUVRbGxCTTFZNVV6SkROREpRVWpOT05VZE9WRE5NT1VsRVJVd3dWMEZNV0VzeFJ6bE1VRFpXVlRjMlRUaE5RMDlYVEZGR1V6TlBSMVJYUVRWWk5WWkRSRlZOUzBrelFWaFVWVmhITkVSUk9URXhTRWszU1RKRE1VWTJTRk5QUzBRelZETkxTMGRUU2toT1VGV XdWVEV5U0VSQlNFVktVVXRQV2twV1FVNUtVbHBTUmxneVdEaENTRmxZVWs5T1MxWlRTVXRCVFU5WFJFZE5NMVE0UWpNMFYxUkRNRUpSVFUxSlRGaFpXVXc0TXpGWU0wdFBWa1JUVGtJd1JGbFlRVGRhVVVJNU9FdzNRMGhhVFZJeVdVaE1SVVk1VmpGQk4xZFBXRE5aUTBSR09VRkpObFJNVFZsUFVWTTJOMWhKUTFkSVRUTlFVRVpLUmpReU9ERXdOVVJDTlU1SFZrMHdTRWd5UkVKRVR6UlJSRk5QV2tsVVZFTkZTMWxaV1RCTFIwTlhWMU5FTWtGVFRESkRXbE14VjBGR1VqQlNWMEZEV1VkRVEwdzBSRTFaUWpkUFNVRkdWa1pLUXpOWVZWUXlNVnBDTUZCT1UwTkhNemxJTVZrMVUxRTBVRVZVV2tsUE9FdFdXa0ZVUTA0elJUUlBPRGhTVGtWSFdWRTNOMFJhUkZKSE1sUkRSVEJXTjFaS1F6WklXVlJSU0VRNFRWTXhWMUl5VmpFM1ZrWXlUamhhUmpCRlJFTkRSRlphVmtWWlVFTldURVZZU2pGQlQwNURNamM0VDFwVlRWb3lOMXBYVVZnNVJ6VlFTVTgwUkVOR1=='] [8958] 2013-07-27 12:55:26.155233 SUCCESS [8958] 2013-07-27 12:55:26.155390 #### VMOPS exit routerProxy #### Checked the userdata within the routervm and the decoded userdata is found: root@r-5-VM:/var/www/html/userdata/192.168.56.150# pwd /var/www/html/userdata/192.168.56.150 root@r-5-VM:/var/www/html/userdata/192.168.56.150# cat user-data 0Z17X1L7WERBV8IXSFZ05X3EBMW75MPG01Z6XBTM8875RNQLR8J7HC1E79N4G3XQ2PBJ0K0189FRTXL74C7EIC4XQIJEKJKHGU7ZNKQTKCN3TKB51W80T6EB2BAZJ2O2E3IEVKEIKKS4B2HVS8X90P6PMA6FCSY2J7UBYBE2129GVLSMOIPWZ7NVNFSYYW1TGBGMKGN1UH6DIDWBAEP3NJ8HP7Y22PI49FU910LF4HLYGK4HP724Z7ZQBI71T41AJLHGBKYA5RU2FF0HRGC5JYEI2Z6I8N6XOFOP7FNKJR97LN8NN5W7QYESRK58E0R245SJMKV7ZD0N6TXDHOGOLYE4CRIS3ODBYA3V9S2C42PR3N5GNT3L9IDEL0WALXK1G9LP6VU76M8MCOWLQFS3OGTWA5Y5VCDUMKI3AXTUXG4DQ911HI7I2C1F6HSOKD3T3KKGSJHNPU0U12HDAHEJQKOZJVANJRZRFX2X8BHYXRONKVSIKAMOWDGM3T8B34WTC0BQMMILXYYL831X3KOVDSNB0DYXA7ZQB98L7CHZMR2YHLEF9V1A7WOX3YCDF9AI6TLMYOQS67XICWHM3PPFJF428105DB5NGVM0HH2DBDO4QDSOZITTCEKYYY0KGCWWSD2ASL2CZS1WAFR0RWACYGDCL4DMYB7OIAFVFJC3XUT21ZB0PNSCG39H1Y5SQ4PETZIO8KVZATCN3E4O88RNEGYQ77DZDRG2TCE0V7VJC6HYTQHD8MS1WR2V17VF2N8ZF0EDCCDVZVEYPCVLEXJ1AONC278OZUMZ27ZWQX9G5PIO4DCFCNSKBJV47SCWDDX3M3V8NO7D0WDS9IV17R0W37194N0AI7PQH4root@r-5-VM:/var/www/html/userdata/192.168.56.150# When the account and the VMs were deleted the userdata for those VMs remained. So this probably is an existing bug not a result of the python plugin. The python script also looks fine save for the print statements in the plugin which could be put into SMlog in the Xen host using utils.SMlog for logging. Could you rename it to vmdata.py since this works for both xen and kvm now. Will wait for Sheng to comment. - Prasanna Santhanam On July 26, 2013, 5:16 p.m., Marcus Sorensen wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/12972/ > ----------------------------------------------------------- > > (Updated July 26, 2013, 5:16 p.m.) > > > Review request for cloudstack, Prasanna Santhanam and Sheng Yang. > > > Bugs: CLOUDSTACK-3163 > > > Repository: cloudstack-git > > > Description > ------- > > Update CitrixResourceBase to use new vmdata programming method, removing > dozens of ssh/scp calls on router and vm startup. This will get rid of > vm_data.sh. > > > Diffs > ----- > > > plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java > 7f8bb3e > > Diff: https://reviews.apache.org/r/12972/diff/ > > > Testing > ------- > > None, please test. > > > Thanks, > > Marcus Sorensen > >
