From f79b19890b6d4060cf2879a0ff20c3d99c750934 Mon Sep 17 00:00:00 2001 From: Zach Marano Date: Fri, 15 Nov 2019 10:14:26 -0800 Subject: Revert "Disable overcommit accounting on E2 VMs (#865)" (#871) This reverts commit 880daf9de49873d37aa6723dff4bba81542d1ecd. --- .../instance_setup/instance_setup.py | 17 ++++------------- .../instance_setup/tests/instance_setup_test.py | 6 +++--- 2 files changed, 7 insertions(+), 16 deletions(-) (limited to 'packages') diff --git a/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py b/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py index dbd3d8f..cb1a2a6 100755 --- a/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py +++ b/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py @@ -28,7 +28,7 @@ from google_compute_engine import file_utils from google_compute_engine import logger from google_compute_engine import metadata_watcher from google_compute_engine.boto import boto_config -from google_compute_engine.compat import distro_name, urlerror +from google_compute_engine.compat import urlerror from google_compute_engine.compat import urlrequest from google_compute_engine.instance_setup import instance_config @@ -65,27 +65,17 @@ class InstanceSetup(object): instance_config_metadata = self._GetInstanceConfig() self.instance_config = instance_config.InstanceConfig( logger=self.logger, instance_config_metadata=instance_config_metadata) - if self.instance_config.GetOptionBool('InstanceSetup', 'set_host_keys'): host_key_types = self.instance_config.GetOptionString( 'InstanceSetup', 'host_key_types') self._SetSshHostKeys(host_key_types=host_key_types) - if self.instance_config.GetOptionBool('InstanceSetup', 'set_boto_config'): self._SetupBotoConfig() - - # machineType is e.g. u'projects/00000000000000/machineTypes/n1-standard-1' - machineType = self.metadata_dict['instance']['machineType'].split('/')[-1] - if machineType.startswith("e2-") and 'bsd' not in distro_name: # Not yet supported on BSD. - subprocess.call(["sysctl", "vm.overcommit_memory=1"]) - if self.instance_config.GetOptionBool( 'InstanceSetup', 'optimize_local_ssd'): self._RunScript('google_optimize_local_ssd') - if self.instance_config.GetOptionBool('InstanceSetup', 'set_multiqueue'): self._RunScript('google_set_multiqueue') - try: self.instance_config.WriteConfig() except (IOError, OSError) as e: @@ -215,9 +205,10 @@ class InstanceSetup(object): Args: host_key_types: string, a comma separated list of host key types. """ + section = 'Instance' instance_id = self._GetInstanceId() if instance_id != self.instance_config.GetOptionString( - 'instance', 'instance_id'): + section, 'instance_id'): self.logger.info('Generating SSH host keys for instance %s.', instance_id) file_regex = re.compile(r'ssh_host_(?P[a-z0-9]*)_key\Z') key_dir = '/etc/ssh' @@ -231,7 +222,7 @@ class InstanceSetup(object): if key_data: self._WriteHostKeyToGuestAttributes(key_data[0], key_data[1]) self._StartSshd() - self.instance_config.SetOption('Instance', 'instance_id', str(instance_id)) + self.instance_config.SetOption(section, 'instance_id', str(instance_id)) def _GetNumericProjectId(self): """Get the numeric project ID. diff --git a/packages/python-google-compute-engine/google_compute_engine/instance_setup/tests/instance_setup_test.py b/packages/python-google-compute-engine/google_compute_engine/instance_setup/tests/instance_setup_test.py index e255f86..a418219 100644 --- a/packages/python-google-compute-engine/google_compute_engine/instance_setup/tests/instance_setup_test.py +++ b/packages/python-google-compute-engine/google_compute_engine/instance_setup/tests/instance_setup_test.py @@ -46,7 +46,7 @@ class InstanceSetupTest(unittest.TestCase): mock_logger_instance = mock.Mock() mock_logger.Logger.return_value = mock_logger_instance mock_watcher_instance = mock.Mock() - mock_watcher_instance.GetMetadata.return_value = {'hello': 'world', 'instance': {'machineType': 'fake'}} + mock_watcher_instance.GetMetadata.return_value = {'hello': 'world'} mock_watcher.MetadataWatcher.return_value = mock_watcher_instance mock_config_instance = mock.Mock() mock_config_instance.GetOptionBool.return_value = True @@ -91,7 +91,7 @@ class InstanceSetupTest(unittest.TestCase): mock.call.config.InstanceConfig().WriteConfig(), ] self.assertEqual(mocks.mock_calls, expected_calls) - self.assertEqual(mock_setup.metadata_dict, {'hello': 'world', 'instance': {'machineType': 'fake'}}) + self.assertEqual(mock_setup.metadata_dict, {'hello': 'world'}) @mock.patch('google_compute_engine.instance_setup.instance_setup.instance_config') @mock.patch('google_compute_engine.instance_setup.instance_setup.metadata_watcher') @@ -386,7 +386,7 @@ class InstanceSetupTest(unittest.TestCase): ] self.assertEqual(sorted(mock_generate_key.mock_calls), expected_calls) - self.mock_instance_config.SetOption.assert_called_with( + self.mock_instance_config.SetOption.assert_called_once_with( 'Instance', 'instance_id', '123') def testGetNumericProjectId(self): -- cgit v1.2.1