Skip to content

Commit

Permalink
Merge branch 'master' into itb
Browse files Browse the repository at this point in the history
* master:
  Fix copy-paste error in namespaces json generation
  Create UH-KoaStore_downtime.yaml
  Create Hawaii-Koa_downtime.yaml
  Correct the port for UNL OSDF origin
  Downtime finished.
  decommission
  extending downtime
  Change /chtc-itb to /chtc/itb/osdf-pelican (since it's served by CHTC-ITB-OSDF-PELICAN-ORIGIN)
  extending downtime
  Add GLOW to to the ITB OSDF origin's allowed VO list
  extending donwtime
  Register the ITB OSDF Pelican Origin
  [CIT_CMS_T2] New Kube Endpoints
  Update UFlorida-HPC_downtime.yaml
  Update UFlorida-HPC_downtime.yaml to replace IB card on cmsio2
  OSCER IPA/LDAP/Auth management upgrade
  extending downtime
  fixed NetworkInterface object issue
  update CHTC_PELICAN_CACHE to use port 8443
  CIT CMS T2 Downtime on Feb27th. Storage and Net updates
  Add downtime for INFN_CNAF_OSDF_CACHE due to checking overload problem
  Add downtime for SU_STASHCACHE_CACHE due to possibly overloaded, checking with the admin
  Update CardiffPRPCachingInfrastructure_downtime.yaml
  Add downtime for DENVER_INTERNET2_OSDF_CACHE due to overloaded
  Add downtime for overloaded due to Stashcache-UofA
  Update projects/UCSD_Bradic.yml
  Create UCSD_Bradic.yml
  Update MWT2.yaml
  Add downtime for UConn-HPC_StashCache_origin due to maintenance day
  Add downtime for MGHPCC_NRP_OSDF_CACHE due to HW problem
  Update APELNormalFactor (HS06) numbers.
  Extending downtime
  Fix typo in is_true()
  Create TAMUCT_Thron.yaml
  • Loading branch information
matyasselmeci committed Feb 29, 2024
2 parents de878bd + 5a1806c commit a78089a
Show file tree
Hide file tree
Showing 25 changed files with 602 additions and 56 deletions.
5 changes: 5 additions & 0 deletions projects/TAMUCT_Thron.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Description: Large-scale agent-based simulations; stochastic optimization; training of neural networks
Department: Department of Science and Mathematics
FieldOfScience: Mathematics and Statistics
Organization: Texas A&M University-Central Texas
PIName: Christopher Thron
6 changes: 6 additions & 0 deletions projects/UCSD_Bradic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Department: Department of Mathematical Sciences & Halicioglu Data Science Institute
Description: Causal Inference and Machine Learning. Specifically, we are interested
in finding optimal individualized treatment rules and provide theoretical guarantees.
FieldOfScience: Mathematical Sciences
Organization: University of California, San Diego
PIName: Jelena Bradic
5 changes: 3 additions & 2 deletions src/net_name_addr_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,9 @@ def iface_matches(network_iface, pattern):
`network_iface` matches `pattern`, False otherwise
"""
if fnmatch.fnmatch(network_iface, pattern):
return True
for _, addrs in network_iface.addresses.items():
if fnmatch.fnmatch(' '.join(addrs), pattern):
return True
for _, addrs in network_iface.addresses.items():
if fnmatch.filter(addrs, pattern):
return True
Expand Down
2 changes: 1 addition & 1 deletion src/stashcache.py
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ def _cache_resource_dict(r: Resource):
return _service_resource_dict(r=r, service_name=XROOTD_CACHE_SERVER, auth_port_default=8443, unauth_port_default=8000)

def _origin_resource_dict(r: Resource):
return _service_resource_dict(r=r, service_name=XROOTD_CACHE_SERVER, auth_port_default=1095, unauth_port_default=1094)
return _service_resource_dict(r=r, service_name=XROOTD_ORIGIN_SERVER, auth_port_default=1095, unauth_port_default=1094)

def _namespace_dict(ns: Namespace):
nsdict = {
Expand Down
2 changes: 1 addition & 1 deletion src/webapp/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ def is_true(input_) -> bool:
if isinstance(input_, bytes):
input_ = input_.decode(errors="replace")
if not isinstance(input_, str):
return bool(input)
return bool(input_)
input_ = input_.lower()
return input_ in ("1", "true", "yes", "on")

Expand Down
Loading

0 comments on commit a78089a

Please sign in to comment.