Merge lp:~jontai/openvista-gtm-integration/bug422885 into lp:openvista-gtm-integration

Proposed by Jon Tai
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jontai/openvista-gtm-integration/bug422885
Merge into: lp:openvista-gtm-integration
Diff against target: 21 lines
1 file modified
mumps/ZOSVGUX.m (+4/-2)
To merge this branch: bzr merge lp:~jontai/openvista-gtm-integration/bug422885
Reviewer Review Type Date Requested Status
JSHER Approve
Review via email:
To post a comment you must log in.
90. By Jon Tai

Per Rick Marshall's suggestion, return the value of ^%ZOSF("CLUSTER") if it exists instead of hard-coding a string. This has a number of advantages -- it's backwards compatible for folks who are upgrading, it preserves the flexibility to have TaskMan configured differently on different machines, and it still allows cluster users to have a host-independent value if they need it.

Revision history for this message
Jon Tai (jontai) wrote :

Bump. Joel -- this is ready for review and merging now.

Revision history for this message
JSHER (joel-sher) wrote :

I assume the CLUSTER node is just manually set by a user.

review: Approve
Revision history for this message
Jon Tai (jontai) wrote :

> I assume the CLUSTER node is just manually set by a user.

Yes. We will likely set it manually to "GTM" in our progenitor databases, since that's the behavior we want most of the time. If we do a really really large deployment where we want multiple Task Managers, or if we do a deployment where we want Task Managers to be configured differently depending on which cluster node it's running on, we can unset the CLUSTER node.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'mumps/ZOSVGUX.m'
--- mumps/ZOSVGUX.m 2009-07-13 18:41:18 +0000
+++ mumps/ZOSVGUX.m 2009-10-19 23:41:13 +0000
@@ -1,4 +1,4 @@
1%ZOSV ;SFISC/AC,PUG/TOAD,HOU/DHW,MSC/JDA/JKT - View commands & special functions. ;13JUL20091%ZOSV ;SFISC/AC,PUG/TOAD,HOU/DHW,MSC/JDA/JKT - View commands & special functions. ;19OCT2009
2 ;;8.0;KERNEL;**275,MSC**;Jul 10, 19952 ;;8.0;KERNEL;**275,MSC**;Jul 10, 1995
3 ;3 ;
4ACTJ() ; # active jobs4ACTJ() ; # active jobs
@@ -139,8 +139,10 @@
139 S Y=0 Q139 S Y=0 Q
140 ;140 ;
141GETENV ;Get environment Return Y='UCI^VOL^NODE^BOX LOOKUP'141GETENV ;Get environment Return Y='UCI^VOL^NODE^BOX LOOKUP'
142 ; see
142 N %HOST,%V S %V=^%ZOSF("PROD"),%HOST=$$RETURN("hostname -s")143 N %HOST,%V S %V=^%ZOSF("PROD"),%HOST=$$RETURN("hostname -s")
143 S Y=$TR(%V,",","^")_"^"_%HOST_"^"_$P(%V,",",2)_":"_%HOST144 N %CLUSTER S %CLUSTER=$G(^%ZOSF("CLUSTER")) I %CLUSTER="" S %CLUSTER=%HOST
145 S Y=$TR(%V,",","^")_"^"_%HOST_"^"_$P(%V,",",2)_":"_%CLUSTER
144 Q146 Q
145 ;147 ;
146VERSION(X) ;return OS version, X=1 - return OS148VERSION(X) ;return OS version, X=1 - return OS


People subscribed via source and target branches