Starting syslog and generating locales in IDE

Author: ivan-khvostishkov

.gitignore

@@ -22,3 +22,4 @@ __pycache__
 /djl-serving/
 /src_diff/
 /tests/geckodriver.log
+/tests/.sm-ssh-owner

.gitlab-ci.yml

@@ -29,6 +29,7 @@ run_tests:
       - tests/htmlcov/
       - tests/coverage.xml
       - tests/.coverage
+      - tests/output/
       - bandit.txt
       - flake8.txt
 
@@ -40,4 +41,5 @@ profile_tests:
   artifacts:
     when: always
     paths:
-      - tests/prof/
+      - tests/prof/
+

sagemaker_ssh_helper/sm-helper-functions

@@ -186,3 +186,28 @@ function _assert_is_ssh_ide_inside_studio() {
     exit 2
   fi
 }
+
+function _locale_gen() {
+  if _is_centos; then
+    :
+  else
+    # Generating UTF-8 locales only for Debian
+    locale-gen
+  fi
+}
+
+function _start_syslogd() {
+  if _is_centos; then
+    /usr/sbin/rsyslogd
+  else
+    service rsyslog start || (echo "ERROR: Failed to start syslogd service")
+  fi
+}
+
+function _start_sshd() {
+  if _is_centos; then
+    /usr/sbin/sshd
+  else
+    service ssh start || (echo "ERROR: Failed to start sshd service" && exit 255)
+  fi
+}

sagemaker_ssh_helper/sm-setup-ssh

@@ -102,24 +102,9 @@ if [[ "$1" == "start-ssh" ]]; then
   # Dump container bootstrap environment (PID 1) - can be different from above, useful for debugging
   ps wwwe -p 1 | tail -1
 
-  if _is_centos; then
-    :
-  else
-    # Generating UTF-8 locales for Debian
-    locale-gen
-  fi
-
-  # Start SSH server
-  if _is_centos; then
-    # NOTE: systemctl will not work in CentOS SageMaker container (e.g. Spark processing) because lack of
-    # privileges to access DBUS, so we run sshd manually. This command doesn't work:
-    # systemctl start sshd
-    /usr/sbin/rsyslogd
-    /usr/sbin/sshd
-  else
-    service rsyslog start || (echo "ERROR: Failed to start syslogd service")
-    service ssh start || (echo "ERROR: Failed to start ssh service" && exit 255)
-  fi
+  _locale_gen
+  _start_syslogd
+  _start_sshd
 
   sm-init-ssm
 

sagemaker_ssh_helper/sm-ssh-ide

@@ -177,12 +177,14 @@ elif [[ "$1" == "start" ]]; then
     echo "sm-ssh-ide: Saving env variables for remote SSH interpreter"
     sm-save-env
 
+    echo "sm-ssh-ide: Generating UTF-8 locales"
+    _locale_gen
+
+    echo "sm-ssh-ide: Starting Syslog service"
+    _start_syslogd
+
     echo "sm-ssh-ide: Starting SSH service"
-    if _is_centos; then
-      /usr/sbin/sshd
-    else
-      service ssh start || (echo "sm-ssh-ide: ERROR: Failed to start ssh service" && exit 255)
-    fi
+    _start_sshd
 
     if [[ "$OPTIONS" != "--ssh-only" ]]; then
 

tests/test_ide.py

@@ -95,6 +95,10 @@ def test_sagemaker_studio(instances, request):
 
     ide = SSHIDE(request.config.getini('sagemaker_studio_domain'), user)
 
+    # TODO:
+    #  os.env["LOCAL_USER_ID"] -> ./.sm-ssh-owner
+    #  ide.upload_UI("./.sm-ssh-owner", "/.sm-ssh-owner") - cannot upload dot file in UI?
+
     ide.create_ssh_kernel_app(
         app_name,
         image_name_or_arn=image_name,
@@ -296,8 +300,14 @@ def test_studio_notebook_in_firefox(request):
     logging.info(f"Found SageMaker Studio kernel menu item: {kernel_menu_item}")
     kernel_menu_item.click()
 
-    # TODO: File -> Open from Path -> /sagemaker-ssh-helper/SageMaker_SSH_IDE.ipynb
-    # TODO: File -> Save Notebook As... -> /SageMaker_SSH_IDE-DS2-CPU.ipynb
+    # TODO: ide.upload_ssh("../SageMaker_SSH_IDE.ipynb", "/root/SageMaker_SSH_IDE-DS2-CPU.ipynb")
+    # TODO: ide.upload_UI("../SageMaker_SSH_IDE.ipynb", "/SageMaker_SSH_IDE-DS2-CPU.ipynb")
+    # TODO: ide.upload_UI("../", "/sagemaker-ssh-helper", exclude=["*"], include=["setup.py", "sagemaker_ssh_helper/"])
+    # TODO: File -> Reload notebook from Disk
+    # TODO: ide.add_new_cell([
+    #  "%%sh"
+    #  "pip3 install -U ./sagemaker-ssh-helper/"
+    #  ])
 
     logging.info("Restarting kernel and running all cells")
     restart_menu_xpath = "//div[@class='lm-Menu-itemLabel p-Menu-itemLabel' " \
@@ -321,10 +331,6 @@ def test_studio_notebook_in_firefox(request):
 
     time.sleep(120)  # Give time to restart
 
-    # TODO: save notebook and download for comparison
-    # TODO: ide.download("/root/SageMaker_SSH_IDE-DS2-CPU.ipynb",
-    #  "/tmp/SageMaker_SSH_IDE-DS2-CPU.ipynb")
-
     studio_ids = ide.get_kernel_instance_ids("sagemaker-data-science-ml-m5-large-6590da95dc67eec021b14bedc036",
                                              timeout_in_sec=300)
     studio_id = studio_ids[0]
@@ -334,6 +340,11 @@ def test_studio_notebook_in_firefox(request):
         services_running = ssm_proxy.run_command_with_output("sm-ssh-ide status")
         services_running = services_running.decode('latin1')
 
+    # TODO: File -> Save Notebook
+    # TODO: ide.download_ssh("/root/SageMaker_SSH_IDE-DS2-CPU.ipynb",
+    #  "./output/SageMaker_SSH_IDE-DS2-CPU.ipynb")
+    # See: https://github.com/aws-samples/sagemaker-ssh-helper/issues/18
+
     assert "127.0.0.1:8889" in services_running
     assert "127.0.0.1:5901" in services_running