Commit 20d9ce29 authored by Brian Long's avatar Brian Long
Browse files

moved unload from shared to enterprise

parent 57293c6e

shared/src/main/java/com/inteligr8/alfresco/asie/rest/AbstractUnregisterNodeWebScript.java→enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/rest/AbstractUnregisterNodeWebScript.java

100644 → 100755
+9 −5
Original line number Diff line number Diff line 
package com.inteligr8.alfresco.asie.rest;

package com.inteligr8.alfresco.asie.enterprise.rest;



import java.io.IOException;

import java.io.Serializable;
@@ -17,7 +17,6 @@ import org.slf4j.Logger; 
import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Qualifier;

import org.springframework.extensions.webscripts.WebScriptException;

import org.springframework.extensions.webscripts.WebScriptRequest;

import org.springframework.extensions.webscripts.WebScriptResponse;

import org.springframework.http.HttpStatus;
@@ -25,6 +24,7 @@ import org.springframework.http.HttpStatus; 
import com.inteligr8.alfresco.asie.Constants;

import com.inteligr8.alfresco.asie.api.CoreAdminApi;

import com.inteligr8.alfresco.asie.model.NodeParameterSet;

import com.inteligr8.alfresco.asie.rest.AbstractAsieNodeWebScript;

import com.inteligr8.alfresco.asie.service.ShardBackupService;

import com.inteligr8.alfresco.asie.spi.ShardStateService;

import com.inteligr8.solr.model.CoreMetadata;
@@ -84,9 +84,11 @@ public abstract class AbstractUnregisterNodeWebScript<T extends NodeParameterSet 
				ShardState shardNode = matchingCore.getValue();

				String core = shardNode.getPropertyBag().get("coreName");

				

				try {

					StatusResponse status = this.getCoreStatus(nodeHostname, nodePort, core);

				if (status == null)

					throw new WebScriptException(HttpStatus.INTERNAL_SERVER_ERROR.value(), "This should never happen");

					if (status == null) {

						this.logger.warn("Registered host/core status could not be retrieved: {}:{}/solr/{}", nodeHostname, nodePort, core);

					} else {

						CoreMetadata coreMetadata = status.getStatus().getCores().get(core);

						if (coreMetadata == null || coreMetadata.getName() == null) {

							this.logger.warn("Registered core does not actually exist on the node host; could be a DNS issue: {}:{}/solr/{}", nodeHostname, nodePort, core);
@@ -94,10 +96,12 @@ public abstract class AbstractUnregisterNodeWebScript<T extends NodeParameterSet 
							this.unloadCore(nodeHostname, nodePort, core);

							cores.put(core, coreMetadata.getInstancePath());

						}

				

					}

				} finally {

					this.sss.remove(matchingCore.getKey());

					this.sbs.forget(shardNode);

				}

			}

		} finally {

			// FIXME maybe a separate tx?

			this.attrService.setAttribute((Serializable) cores, keys);

shared/src/main/java/com/inteligr8/alfresco/asie/rest/ReloadNodeShardWebScript.java→enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/rest/ReloadNodeShardWebScript.java

100644 → 100755
+2 −1
Original line number Diff line number Diff line 
package com.inteligr8.alfresco.asie.rest;

package com.inteligr8.alfresco.asie.enterprise.rest;



import java.io.IOException;

import java.io.Serializable;
@@ -21,6 +21,7 @@ import org.springframework.stereotype.Component; 


import com.inteligr8.alfresco.asie.Constants;

import com.inteligr8.alfresco.asie.api.CoreAdminApi;

import com.inteligr8.alfresco.asie.rest.AbstractAsieNodeWebScript;

import com.inteligr8.solr.model.ExceptionResponse;

import com.inteligr8.solr.model.core.CreateRequest;

import com.inteligr8.solr.model.core.ReloadRequest;

shared/src/main/java/com/inteligr8/alfresco/asie/rest/ReloadNodeWebScript.java→enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/rest/ReloadNodeWebScript.java

100644 → 100755
+2 −1
Original line number Diff line number Diff line 
package com.inteligr8.alfresco.asie.rest;

package com.inteligr8.alfresco.asie.enterprise.rest;



import java.io.IOException;

import java.io.Serializable;
@@ -23,6 +23,7 @@ import org.springframework.stereotype.Component; 


import com.inteligr8.alfresco.asie.Constants;

import com.inteligr8.alfresco.asie.api.CoreAdminApi;

import com.inteligr8.alfresco.asie.rest.AbstractAsieNodeWebScript;

import com.inteligr8.solr.model.ExceptionResponse;

import com.inteligr8.solr.model.core.CreateRequest;

import com.inteligr8.solr.model.core.ReloadRequest;

shared/src/main/java/com/inteligr8/alfresco/asie/rest/UnloadNodeShardWebScript.java→enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/rest/UnloadNodeShardWebScript.java

100644 → 100755
+1 −1
Original line number Diff line number Diff line 
package com.inteligr8.alfresco.asie.rest;

package com.inteligr8.alfresco.asie.enterprise.rest;



import org.alfresco.repo.index.shard.ShardState;

import org.springframework.extensions.webscripts.WebScriptRequest;

shared/src/main/java/com/inteligr8/alfresco/asie/rest/UnloadNodeWebScript.java→enterprise-module/src/main/java/com/inteligr8/alfresco/asie/enterprise/rest/UnloadNodeWebScript.java

100644 → 100755
+1 −1
Original line number Diff line number Diff line 
package com.inteligr8.alfresco.asie.rest;

package com.inteligr8.alfresco.asie.enterprise.rest;



import org.springframework.extensions.webscripts.WebScriptRequest;

import org.springframework.stereotype.Component;