[rhq-project/rhq] 899943: [1139735, 1157480] More upgrade use cases that did...

[John Mazzitelli]

  Branch: refs/heads/release/jon3.3.x
  Home:   https://github.com/rhq-project/rhq
  Commit: 8999436f3bfdc8bb7c311d1f27615c69d455f845
      https://github.com/rhq-project/rhq/commit/8999436f3bfdc8bb7c311d1f27615c6...
  Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt;
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M
modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
    M
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java
    M
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerService.java
    M
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
    M
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java
    M
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java

  Log Message:
  -----------
  [1139735, 1157480] More upgrade use cases that didn't work.
[1139735] An upgrade with a number of storage nodes > than our replication
factor (>= 4) could fail because our check for the storage cluster
version can fail if the auth info or version info are not replicated
to the currently running SNs.  To avoid this, for ugrades we now push
all storage cluster interaction to the post-upgrade step (i.e.
rhqctl --storage-schema).  This includes the schema creation for a new,
remote storage cluster.

[1157480] An upgrade of standalone storage node can fail because those
installs may not have set proper DB props in rhq-server.properties.  It
wasn't required in the past but it is now.  In the code we now make sure
the properties are copied forward on upgrade. But there is also doco needed
here because prior to upgrade from an earlier version, using standalone
SNs, the old rhq-server.properties files will need to be updated.

Also, update the --list-versions report to better reflect that it may need
all SNs to be running to perform the storage schema version check.

(cherry picked from commit 1b45c2af77fe3a4670bc4317508780f80ae3f0bc)
Signed-off-by: Jay Shaughnessy <jshaughn(a)redhat.com&gt;


  Commit: 3fcbd30e69b1611c95b842ec9651e80f1618c793
      https://github.com/rhq-project/rhq/commit/3fcbd30e69b1611c95b842ec9651e80...
  Author: Jay Shaughnessy <jshaughn(a)redhat.com&gt;
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java

  Log Message:
  -----------
  Merge branch 'release/jon3.3.x' of github.com:rhq-project/rhq into
release/jon3.3.x


  Commit: 65f745fc70ae63045476ba8e0cd641cda1000677
      https://github.com/rhq-project/rhq/commit/65f745fc70ae63045476ba8e0cd641c...
  Author: John Mazzitelli <mazz(a)redhat.com&gt;
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
    M
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
    M
modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java

  Log Message:
  -----------
  BZ 1158228 - to support install on Windows, allow for agent to be told to reload its
agent config xml via marker file

(cherry picked from commit 438e10b42c4d8725637eb4582b0a7d072b040ee2)
Signed-off-by: Jay Shaughnessy <jshaughn(a)redhat.com&gt;


Compare: https://github.com/rhq-project/rhq/compare/73e845e155b2...65f745fc70ae