|#2||22838||russell_jackson||More SDP clean up/simplification.|
Branched a Unix only version of the SDP.
Removed extra items to create a cleaner tree.
Moved a few items around to make more sense without Windows in the mix.
Fixed recent regression with 'restart' option in init scripts;
they now need to pass in the SDP_INSTANCE parameter. Also
corrected usage messages.
Fixed an environment insulation bug in init scripts.
More testing (and thinking) revealed that the only way to truly
provide a guarantee of insulation from user-set defaults in
~perforce/.bashrc (etc.) is to pass SDP_INSTANCE as a parameter to
the *_base scripts, so that the instance name is explicitly passed
into the su/exec call (when run as root).
This change also includes minor cleanup in init scripts and *_base
Fixed env bug seen when running init scripts as root.
Updated *_base scripts and *_init script templates to a new
1. Init scripts that use corresponding *_base scripts are
minimized so that do nothing more than set SDP_INSTANCE and
then call the corresponding *_base script.
2. The 'su' commands always pass $* instead of $1, deferring
all processing to the *_base script.
3. The shell environment is now guaranteeds to have the same
results regardless of whether it is called as 'root' or as
the defined OSUSER.
4. The p4_vars file is always sourced exactly once. Two
calls to 'source p4_vars' appear in some cases, one
immediatley before the su/exec call, and another after the
after the 'su/exec'. Only one or the other is sourced.
5. All init scripts have a reasonably consistent usage message.
6. All init scripts accept a 'status' argument.
This change fixes a bug where 'p4broker_N_init status' run as the
'perforce' user would report many pids unrelated to Perforce
if run as root, e.g. doing 'service p4broker_N_init status'.
This also eliminates a potential issue where the 'perforce'
user might source a p4_vars with a default instance in ~/.profile
or ~/.bashrc, thus invalidating the instance specified when the
user ran the init script as root.
Updated p4web_base and p4ftpd_base with a check that they
are running as root, with error if not (as those init scripts
must be run as root; they can't run as perforce).
Routine merge to dev from main using:
p4 merge -b perforce_software-sdp-dev
|#4||15778||tom_tyler||Routine Merge Down to dev from main.|
Normalized P4INSTANCE to SDP_INSTANCE to get Unix/Windows
implementations in sync.
1. Things that interact with SDP in both Unix and Windows
environments shoudn't have to account for this obscure
SDP difference between Unix and Windows. (I came across
this doing CBD work).
2. The Windows and Unix scripts have different variable
names for defining the same concept, the SDP instance.
Unix uses P4INSTANCE, while Windows uses SDP_INSTANCE.
3. This instance tag, a data set identifier, is an SDP concept.
I prefer the SDP_INSTANCE name over P4INSTANCE, so I prpose
to normalize to SDP_INSTANCE.
4. The P4INSTANCE name makes it look like a setting that might be
recognized by the p4d itself, which it is not. (There are other
such things such as P4SERVER that could perhaps be renamed as
a separate task; but I'm not sure we want to totally disallow
the P4 prefix for variable names. It looks too right to be wrong
in same cases, like P4BIN and P4DBIN. That's a discussion for
another day, outside the scope of this task).
* Fixed a bug in the Windows 2013.3 upgrade script that
was referencing undefined P4INSTANCE, as the Windows
environment defined only SDP_INSTANCE.
* Had P4INSTANCE been removed completely, this change would
likely cause trouble for users doing updates for existing
SDP installations. So, though it involves slight technical debt,
I opted to keep a redundant definition of P4INSTANCE
in p4_vars.template, with comments indicating SDP_INSTANCE should be
used in favor of P4INSTANCE, with a warning that P4INSTANCE
may go away in a future release. This should avoid unnecessary
* In mkdirs.sh, the varialbe name was INSTANCE rather than
SDP_INSTANCE. I changed that as well. That required manual
change rather than sub/replace to avoid corrupting other similar
varialbe names (e.g. MASTERINSTANCE).
This is a trivial change technically (a substitute/replace, plus
tweaks in p4_vars.template), but impacts many files.
Updated copyright date to 2015
Updated shell scripts to require an instance parameter to eliminate the need
for calling p4master_run. Python and Perl still need it since you have to set the
environment for them to run in.
Incorporated comments from reviewers. Left the . instead of source as that seems
more common in the field and has the same functionality.
|#1||10148||tom_tyler||Promoted the Perforce Server Deployment Package to The Workshop.|