[rhq-project/rhq] 686fb1: [BZ 185375] make sure we shut down key scanner in ...

[John Sanda]

  Branch: refs/heads/master
  Home:   https://github.com/rhq-project/rhq
  Commit: 686fb173b1a3ba55af83b9ed920cfd9faf38780b
      https://github.com/rhq-project/rhq/commit/686fb173b1a3ba55af83b9ed920cfd9...
  Author: John Sanda <jsanda(a)redhat.com&gt;
  Date:   2015-03-08 (Sun, 08 Mar 2015)

  Changed paths:
    M
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/KeyScanner.java
    M
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateAggregateMetrics.java

  Log Message:
  -----------
  [BZ 185375] make sure we shut down key scanner in event of failure


  Commit: f0a36c95d7275cd7a176ee7d90d5fbdae438ffa2
      https://github.com/rhq-project/rhq/commit/f0a36c95d7275cd7a176ee7d90d5fbd...
  Author: John Sanda <jsanda(a)redhat.com&gt;
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateAggregateMetrics.java
    M
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateData.java
    A
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/RetryWrite.java
    A
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/migration/QueryExecutor.java

  Log Message:
  -----------
  [BZ 185375] retry failed batches individually

Previously when a request failed whether it was on the data read or on one or
more of the batch inserts, we would resubmit all of the requests. We now retry
failed batches individually which should be more efficient since we are not
resubmitting requests that have succeeded.

Conflicts:
	modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateAggregateMetrics.java
	modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateData.java


  Commit: cee9a69bdbe43d0ad08ef63f5bb263ad142312ef
      https://github.com/rhq-project/rhq/commit/cee9a69bdbe43d0ad08ef63f5bb263a...
  Author: John Sanda <jsanda(a)redhat.com&gt;
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    M
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/MigrateAggregateMetrics.java

  Log Message:
  -----------
  [BZ 185375] adding changes from merge conflicts from previous commit


Compare: https://github.com/rhq-project/rhq/compare/546d302bc986...cee9a69bdbe4