#!/bin/bash #------------------------------------------------------------------------------ # Copyright (c) Perforce Software, Inc., 2007-2014. All rights reserved # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met# # # 1 Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL PERFORCE # SOFTWARE, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH # DAMAGE. #------------------------------------------------------------------------------ # Generate an SDP instance-specific variant of the generic # P4Broker config file. Display to standard output. # Usage# # cd /p4/common/bin # gen_default_broker_cfg.sh > /tmp/p4broker.cfg.ToBeReviewed Instance=$1 if [ -z "$Instance" ]; then echo Instance number/name required as a parameter to this script. exit 1 fi source /p4/common/bin/p4_vars $Instance $P4BROKERBIN -C | sed "s#/p4/broker/.p4tickets#$P4TICKETS#g" |\ sed "s#/p4/broker#$P4HOME/bin#g" |\ sed "s#broker.log#$LOGS/p4broker.log#g" |\ sed "s#1667#$P4BROKERPORTNUM#g" |\ sed "s#localhost:1666#$P4PORT#g" |\ sed "email@example.com#$MAILTO#g"
Added net.autotune=1 setting and related comments.
Corrected misinformation in comments related to net.tcpsize configurable, and tweaked logic slightly.
Added more info in README and changed format to Markdown (renaming from .txt to .md).
Enhanced gen_default_broker_cfg.sh to detect whether net.autotune is enabled, and if so, add net.autotune to the broker configuration.
Added quoting around some values to address an issue where
a valid email address starting with a '#' character (a distribution
list email address) resulted in a broken generated broker config
gen_default_broker_cfg.sh: Fixed issue supporting $MAILTO values containing '#'.
There was a 'sed' expression that choked when $MAILTO value contained a '#' character,
e.g. "#PerforceAdminsDistributionList" (where the '#' indicates a distribution list on
an Exchange Server).
The sed utility allows for various delimiter characters, e.g. ':', '/', '#'. The idea is
to select one that on won't conflict with whatever your are substituting. The
prior version assumed '#' was a good delimter for $MAITO values, but that has proven
not to be the case. Now the '/'' character is used for that particular sed expression
Routine merge to dev from main using:
p4 merge -b perforce_software-sdp-dev
|#6||13933||tom_tyler||Minor tweaks to broker config generator.|
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.
Modified P4BROKERPORTNUM to just be the port number and added P4BROKERPORT to instance_vars
to be consistent with P4PORT. Also makes it easier to modify p4review.py to use P4BROKERPORT
rather than P4PORT for the subject line when needed.
Initial work to simplify p4_vars and remove cluster stuff.
Testing of named instances surfaced some bugs that are in prod sdp,
now fixed in dev.
Added three triggers from RCJ SDP
Moved p4review.cfg into the new /p4/common/cfg to go along with the
instance_vars files. mkdirs.sh now generates an instance_p4review.cfg
Removed incremental p4verify to clean up a bit. It didn't support replicas
and was really never used.
All port settings now live in <instance>_vars file. You set what you want
the ports to be in mkdirs.sh. There is no more fancy logic to try to guess
what the port should be. You set it, and that is what it is.
Remaining to do is to updated scripts to not need p4master_run. Saved
that work for later since this is tested and works.
|#1||10148||tom_tyler||Promoted the Perforce Server Deployment Package to The Workshop.|