You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2017/07/19 17:43:15 UTC
[1/2] oodt git commit: Record change for OODT-954 and include Val's
note about workflow instance rep/Lucene upgrade.
Repository: oodt
Updated Branches:
refs/heads/master bec179a3c -> 44c155554
Record change for OODT-954 and include Val's note about workflow instance rep/Lucene upgrade.
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/ffd8ad0c
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/ffd8ad0c
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/ffd8ad0c
Branch: refs/heads/master
Commit: ffd8ad0cc4dd2ee0e9a50c5ecb793817b41cba4e
Parents: bec179a
Author: Chris Mattmann <ma...@apache.org>
Authored: Wed Jul 19 10:42:15 2017 -0700
Committer: Chris Mattmann <ma...@apache.org>
Committed: Wed Jul 19 10:42:15 2017 -0700
----------------------------------------------------------------------
CHANGES.txt | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/ffd8ad0c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b7cf057..4ac50ed 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,20 @@ Apache OODT Change Log
Release 1.1 - 07/18/2017
+*** NOTE: A change was introduced in this version that causes a forced upgrade to your
+Lucene Workflow Instance repository catalog. If you are using Lucene in the workflow manager,
+the best bet is to blow away your old workflow instance catalog, and then allow it to be
+rebuilt automatically. You can detect if you are affected by this issue if you see a message
+akin to the below.
+Jul 19, 2017 10:45:02 AM org.apache.oodt.cas.workflow.instrepo.LuceneWorkflowInstanceRepository addWorkflowInstanceToCatalog
+WARNING: Unable to index workflow instance: [d8dad567-6c90-11e7-9e4e-7574e3a12106]: Message: Format version is not supported
+(resource BufferedChecksumIndexInput(MMapIndexInput(path="/project/oodt/dev/jedi/data/workflow/slothrop/segments"))): -1 (needs
+to be between 1071082519 and 1071082519). This version of Lucene only supports indexes created with release 5.0 and later.
+java.lang.NullPointerException
+****
+
+* OODT-954 CAS-PGE FileManagerFileStager has NPE b/c it does not set Product Structure (mattmann)
+
* OODT-526 Add base functionality in Curator for Task List persistence (mjoyce, mattmann)
* OODT-525 Export IngestTaskList from Curator (mjoyce, mattmann)
[2/2] oodt git commit: Fix for OODT-954: CAS-PGE
FileManagerFileStager has NPE b/c it does not set Product Structure
Posted by ma...@apache.org.
Fix for OODT-954: CAS-PGE FileManagerFileStager has NPE b/c it does not set Product Structure
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/44c15555
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/44c15555
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/44c15555
Branch: refs/heads/master
Commit: 44c1555543ff912a907c592d225b5e69564a6a52
Parents: ffd8ad0
Author: Chris Mattmann <ma...@apache.org>
Authored: Wed Jul 19 10:43:10 2017 -0700
Committer: Chris Mattmann <ma...@apache.org>
Committed: Wed Jul 19 10:43:10 2017 -0700
----------------------------------------------------------------------
.../cas/pge/staging/FileManagerFileStager.java | 1 +
.../pge/staging/TestFileManagerFileStager.java | 41 ++++++++++++++++++++
2 files changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/44c15555/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java
----------------------------------------------------------------------
diff --git a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java
index 629b9fb..dbf6602 100644
--- a/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java
+++ b/pge/src/main/java/org/apache/oodt/cas/pge/staging/FileManagerFileStager.java
@@ -88,6 +88,7 @@ public class FileManagerFileStager extends FileStager {
@VisibleForTesting
static Product createProduct(URI path) {
Product product = new Product();
+ product.setProductStructure(Product.STRUCTURE_FLAT); //TODO: only support flat prods for now
Reference reference = new Reference();
reference.setDataStoreReference(path.toString());
product.setProductReferences(Lists.newArrayList(reference));
http://git-wip-us.apache.org/repos/asf/oodt/blob/44c15555/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileManagerFileStager.java
----------------------------------------------------------------------
diff --git a/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileManagerFileStager.java b/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileManagerFileStager.java
new file mode 100644
index 0000000..e74c6b8
--- /dev/null
+++ b/pge/src/test/java/org/apache/oodt/cas/pge/staging/TestFileManagerFileStager.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.oodt.cas.pge.staging;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import org.apache.oodt.cas.filemgr.structs.Product;
+
+import junit.framework.TestCase;
+
+public class TestFileManagerFileStager extends TestCase {
+
+ public void testProductStructure(){
+ FileManagerFileStager stager = new FileManagerFileStager();
+ try {
+ Product p = stager.createProduct(new URI("file://tmp/test.txt"));
+ assertNotNull(p);
+ assertEquals(Product.STRUCTURE_FLAT, p.getProductStructure());
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ fail(e.getLocalizedMessage());
+ }
+
+ }
+}