You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ge...@apache.org on 2017/04/28 10:32:08 UTC
[07/13] brooklyn-server git commit: minor comments, tidy, and logging
minor comments, tidy, and logging
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/cee8e1ee
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/cee8e1ee
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/cee8e1ee
Branch: refs/heads/master
Commit: cee8e1eed5b069dee62462e5be0d4785502328ba
Parents: 340e036
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Sat Apr 22 00:05:41 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Sat Apr 22 00:38:09 2017 +0100
----------------------------------------------------------------------
.../catalog/CatalogYamlTemplateTest.java | 3 ++-
.../core/BrooklynFeatureEnablement.java | 2 ++
.../BrooklynMementoPersisterToObjectStore.java | 28 +++++++++++---------
.../persist/FileBasedStoreObjectAccessor.java | 2 ++
4 files changed, 21 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cee8e1ee/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
index cb585e0..bf5861e 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlTemplateTest.java
@@ -40,6 +40,7 @@ import org.apache.brooklyn.entity.stock.BasicApplication;
import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.util.core.config.ConfigBag;
import org.testng.Assert;
+import org.testng.ITestNGListener;
import org.testng.TestListenerAdapter;
import org.testng.TestNG;
import org.testng.annotations.Test;
@@ -269,7 +270,7 @@ public class CatalogYamlTemplateTest extends AbstractYamlTest {
// convenience for running in eclipse when the TestNG plugin drags in old version of snake yaml
public static void main(String[] args) {
- TestListenerAdapter tla = new TestListenerAdapter();
+ ITestNGListener tla = new TestListenerAdapter();
TestNG testng = new TestNG();
testng.setTestClasses(new Class[] { CatalogYamlTemplateTest.class });
testng.addListener(tla);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cee8e1ee/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
index 466fe88..677640b 100644
--- a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
+++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
@@ -126,6 +126,8 @@ public class BrooklynFeatureEnablement {
* Whether to scan newly loaded bundles for catalog.bom and load it.
*
* The functionality loads catalog items regardless of the persistence state so best used with persistence disabled.
+ * If a bundle is uploaded its BOM is scanned regardless of this property (this only applies to bundles
+ * installed through a non-brooklyn method, eg karaf.)
*/
public static final String FEATURE_LOAD_BUNDLE_CATALOG_BOM = FEATURE_PROPERTY_PREFIX+".osgi.catalog_bom";
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cee8e1ee/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterToObjectStore.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterToObjectStore.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterToObjectStore.java
index 7707adb..ccafcc3 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterToObjectStore.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterToObjectStore.java
@@ -301,10 +301,10 @@ public class BrooklynMementoPersisterToObjectStore implements BrooklynMementoPer
}
BrooklynMementoRawData subPathData = subPathDataBuilder.build();
- LOG.debug("Loaded rebind lists; took {}: {} entities, {} locations, {} policies, {} enrichers, {} feeds, {} catalog items; from {}", new Object[]{
+ LOG.debug("Loaded rebind lists; took {}: {} entities, {} locations, {} policies, {} enrichers, {} feeds, {} catalog items, {} bundles; from {}", new Object[]{
Time.makeTimeStringRounded(stopwatch),
subPathData.getEntities().size(), subPathData.getLocations().size(), subPathData.getPolicies().size(), subPathData.getEnrichers().size(),
- subPathData.getFeeds().size(), subPathData.getCatalogItems().size(),
+ subPathData.getFeeds().size(), subPathData.getCatalogItems().size(), subPathData.getBundles().size(),
objectStore.getSummaryName() });
return subPathData;
@@ -354,10 +354,10 @@ public class BrooklynMementoPersisterToObjectStore implements BrooklynMementoPer
BrooklynMementoRawData result = builder.build();
if (LOG.isDebugEnabled()) {
- LOG.debug("Loaded rebind raw data; took {}; {} entities, {} locations, {} policies, {} enrichers, {} feeds, {} catalog items, from {}", new Object[]{
+ LOG.debug("Loaded rebind raw data; took {}; {} entities, {} locations, {} policies, {} enrichers, {} feeds, {} catalog items, {} bundles, from {}", new Object[]{
Time.makeTimeStringRounded(stopwatch.elapsed(TimeUnit.MILLISECONDS)), result.getEntities().size(),
result.getLocations().size(), result.getPolicies().size(), result.getEnrichers().size(),
- result.getFeeds().size(), result.getCatalogItems().size(),
+ result.getFeeds().size(), result.getCatalogItems().size(), result.getBundles().size(),
objectStore.getSummaryName() });
}
@@ -448,11 +448,11 @@ public class BrooklynMementoPersisterToObjectStore implements BrooklynMementoPer
BrooklynMementoManifest result = builder.build();
if (LOG.isDebugEnabled()) {
- LOG.debug("Loaded rebind manifests; took {}: {} entities, {} locations, {} policies, {} enrichers, {} feeds, {} catalog items; from {}", new Object[]{
+ LOG.debug("Loaded rebind manifests; took {}: {} entities, {} locations, {} policies, {} enrichers, {} feeds, {} catalog items, {} bundles; from {}", new Object[]{
Time.makeTimeStringRounded(stopwatch),
result.getEntityIdToManifest().size(), result.getLocationIdToType().size(),
result.getPolicyIdToType().size(), result.getEnricherIdToType().size(), result.getFeedIdToType().size(),
- result.getCatalogItemMementos().size(),
+ result.getCatalogItemMementos().size(), result.getBundles().size(),
objectStore.getSummaryName() });
}
@@ -498,9 +498,9 @@ public class BrooklynMementoPersisterToObjectStore implements BrooklynMementoPer
BrooklynMemento result = builder.build();
if (LOG.isDebugEnabled()) {
- LOG.debug("Loaded rebind mementos; took {}: {} entities, {} locations, {} policies, {} enrichers, {} feeds, {} catalog items, from {}", new Object[]{
+ LOG.debug("Loaded rebind mementos; took {}: {} entities, {} locations, {} policies, {} enrichers, {} feeds, {} catalog items, {} bundles, from {}", new Object[]{
Time.makeTimeStringRounded(stopwatch.elapsed(TimeUnit.MILLISECONDS)), result.getEntityIds().size(),
- result.getLocationIds().size(), result.getPolicyIds().size(), result.getEnricherIds().size(),
+ result.getLocationIds().size(), result.getPolicyIds().size(), result.getEnricherIds().size(), result.getManagedBundleIds().size(),
result.getFeedIds().size(), result.getCatalogItemIds().size(),
objectStore.getSummaryName() });
}
@@ -630,11 +630,11 @@ public class BrooklynMementoPersisterToObjectStore implements BrooklynMementoPer
Stopwatch stopwatch = deltaImpl(delta, exceptionHandler);
if (LOG.isDebugEnabled()) LOG.debug("Checkpointed "+(previouslyQueued ? "previously queued " : "")+"delta of memento in {}: "
- + "updated {} entities, {} locations, {} policies, {} enrichers, {} catalog items; "
- + "removed {} entities, {} locations, {} policies, {} enrichers, {} catalog items",
+ + "updated {} entities, {} locations, {} policies, {} enrichers, {} catalog items, {} bundles; "
+ + "removed {} entities, {} locations, {} policies, {} enrichers, {} catalog items, {} bundles",
new Object[] {Time.makeTimeStringRounded(stopwatch),
- delta.entities().size(), delta.locations().size(), delta.policies().size(), delta.enrichers().size(), delta.catalogItems().size(),
- delta.removedEntityIds().size(), delta.removedLocationIds().size(), delta.removedPolicyIds().size(), delta.removedEnricherIds().size(), delta.removedCatalogItemIds().size()});
+ delta.entities().size(), delta.locations().size(), delta.policies().size(), delta.enrichers().size(), delta.catalogItems().size(), delta.bundles().size(),
+ delta.removedEntityIds().size(), delta.removedLocationIds().size(), delta.removedPolicyIds().size(), delta.removedEnricherIds().size(), delta.removedCatalogItemIds().size(), delta.removedBundleIds().size()});
}
@Override
@@ -800,7 +800,9 @@ public class BrooklynMementoPersisterToObjectStore implements BrooklynMementoPer
private void updatePlaneId(String planeId, PersistenceExceptionHandler exceptionHandler) {
try {
if (planeId==null) {
- LOG.warn("Null content for planeId");
+ // can happen during initial backup creation; if happens any other time, there's a problem!
+ LOG.debug("Null content for planeId; not updating at server");
+ return;
}
String persistedPlaneId = read(PLANE_ID_FILE_NAME);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/cee8e1ee/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/FileBasedStoreObjectAccessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/FileBasedStoreObjectAccessor.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/FileBasedStoreObjectAccessor.java
index a9f0613..1800a05 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/FileBasedStoreObjectAccessor.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/FileBasedStoreObjectAccessor.java
@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Charsets;
import com.google.common.base.MoreObjects;
+import com.google.common.base.Preconditions;
import com.google.common.io.ByteSource;
import com.google.common.io.Files;
@@ -79,6 +80,7 @@ public class FileBasedStoreObjectAccessor implements PersistenceObjectStore.Stor
@Override
public void put(String val) {
+ Preconditions.checkNotNull(val, "Illegal attempt to write a null string");
put(ByteSource.wrap(val.getBytes(Charsets.UTF_8)));
}