Merge pull request #51 from manikandan-thangavelu-rl/topic-release

Chore: Upgrade R version, Set auto stop time to 15 mins

Author: RLIndia

products/RStudio/machine-images/config/infra/files/rstudio/check-idle

@@ -9,7 +9,7 @@ LAST_ACTIVE_TIME_FILENAME = '/tmp/last-active-rsession-time'
 ACCESS_LOG_FILENAME = '/var/log/nginx/access.log'
 
 # To disable auto-stop for RStudio, enter 0 as the value below for MAX_IDLE_MINUTES
-MAX_IDLE_MINUTES = 60
+MAX_IDLE_MINUTES = 15
 
 if MAX_IDLE_MINUTES == 0:
     print('Auto-stop disabled. Exiting..')
@@ -26,7 +26,8 @@ def get_activity_count():
         for line in access_log:
             # nginx sometimes pings the RStudio instance
             # which does not indicate user activity
-            if "POST /events/get_events" not in line:
+            # Load balancer health check should also be not considered as an activity
+            if "POST /events/get_events" not in line and "ELB-HealthChecker/2.0" not in line:
                 non_ping_count += 1
     return (non_ping_count)
 

products/RStudio/machine-images/config/infra/provisioners/provision-rstudio.sh

@@ -9,13 +9,13 @@ sudo yum install -y libcurl-devel-7.79.* libpng-devel-1.5.* cairo-devel-1.15.* p
 sudo yum install -y xorg-x11-server-devel-1.20.* libX11-devel-1.6.* libXt-devel-1.1.*
 
 # Install R from source (https://docs.rstudio.com/resources/install-r-source/)
-R_VERSION="3.6.3"
+R_VERSION="4.1.3"
 mkdir -p "/tmp/R/"
-curl -s "https://cran.rstudio.com/src/base/R-3/R-${R_VERSION}.tar.gz" > "/tmp/R/R-${R_VERSION}.tar.gz"
+curl -s "https://cran.r-project.org/src/base/R-4/R-${R_VERSION}.tar.gz" > "/tmp/R/R-${R_VERSION}.tar.gz"
 cd "/tmp/R/"
 tar xvf "R-${R_VERSION}.tar.gz"
 cd "R-${R_VERSION}/"
-./configure --enable-memory-profiling --enable-R-shlib --with-blas --with-lapack
+./configure --enable-memory-profiling --enable-R-shlib --with-blas --with-lapack --with-pcre1
 sudo make
 sudo make install
 cd "../../.."
@@ -52,14 +52,6 @@ sudo chmod -R 600 "/etc/nginx"
 sudo systemctl enable nginx
 sudo systemctl restart nginx
 
-# Install script that checks idle time and shuts down if max idle is reached
-sudo mv "/tmp/rstudio/check-idle" "/usr/local/bin/"
-sudo chown root: "/usr/local/bin/check-idle"
-sudo chmod 775 "/usr/local/bin/check-idle"
-sudo crontab -l 2>/dev/null > "/tmp/crontab"
-echo '*/2 * * * * /usr/local/bin/check-idle 2>&1 >> /var/log/check-idle.log' >> "/tmp/crontab"
-sudo crontab "/tmp/crontab"
-
 
 # Install system packages necessary for installing R packages through RStudio CRAN [devtools, tidyverse]
 sudo yum install -y git-2.23.* openssl-devel-1.0.* libxml2-devel-2.9.*
@@ -95,6 +87,13 @@ sudo su - -c "R -e \"install.packages('MASS', version='7.3.53.1', repos='http://
 sudo su - -c "R -e \"install.packages('quantreg', version='5.85', repos='http://cran.rstudio.com/')\""
 sudo su - -c "R -e \"install.packages('DescTools', version='0.99.41', repos='http://cran.rstudio.com/')\""
 
+# Install script that checks idle time and shuts down if max idle is reached
+sudo mv "/tmp/rstudio/check-idle" "/usr/local/bin/"
+sudo chown root: "/usr/local/bin/check-idle"
+sudo chmod 775 "/usr/local/bin/check-idle"
+sudo crontab -l 2>/dev/null > "/tmp/crontab"
+echo '*/2 * * * * /usr/local/bin/check-idle 2>&1 >> /var/log/check-idle.log' >> "/tmp/crontab"
+sudo crontab "/tmp/crontab"
 
 # Wipe out all traces of provisioning files
 sudo rm -rf "/tmp/rstudio"