Skip to content

Commit

Permalink
update dockerfile and condor cron for sysview
Browse files Browse the repository at this point in the history
  • Loading branch information
jlstephen committed Apr 22, 2024
1 parent e3e2048 commit 2fa50da
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN yum install --disablerepo=osg-upcoming -y condor

RUN yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
RUN yum install -y docker-ce-cli
RUN yum install -y http://mirror.grid.uchicago.edu/pub/mwt2/sw/el7/mwt2-sysview-worker-2.0.5-1.noarch.rpm
RUN yum install -y http://mirror.grid.uchicago.edu/pub/mwt2/sw/el7/mwt2-sysview-worker-2.0.6-1.el7.noarch.rpm
RUN yum install -y python36-tabulate

COPY condor/*.conf /etc/condor/config.d/
Expand All @@ -55,6 +55,7 @@ COPY scripts/entrypoint.sh /bin/entrypoint.sh
COPY prometheus/exporter.py /app/
RUN pip3 install prometheus_client

RUN pip3 install python3-memcached
RUN chmod 755 /usr/local/sbin/condor_node_check.sh

# Igor's wrapper for singularity to make things work inside of K8S, requires OASIS CVMFS
Expand Down
3 changes: 3 additions & 0 deletions condor/01-nodechk.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ STARTD_CRON_nodecheck_PERIOD = 5m
STARTD_CRON_nodecheck_MODE = periodic
STARTD_CRON_nodecheck_RECONFIG = false
STARTD_CRON_nodecheck_KILL = true

STARTD_ATTRS = $(STARTD_ATTRS) NodeOnline
START = ($(START)) && (NodeOnline =?= True)
7 changes: 1 addition & 6 deletions scripts/condor_node_check.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
#!/bin/bash
### GET THE NODE NAME FIRST
full_node=$(hostname)
IFS='.' read -r nodename af uchi edu <<< "${full_node}"

/bin/sysclient --config-file /etc/sysview/sysview.ini online "${nodename}"
/bin/condor_node_check --config-file /etc/sysview/sysview.ini
/usr/bin/condor_node_check --config-file /etc/sysview/sysview.ini

0 comments on commit 2fa50da

Please sign in to comment.