HoustonPutman commented on code in PR #4577:
URL: https://github.com/apache/solr/pull/4577#discussion_r3808225042
##########
solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java:
##########
@@ -225,7 +225,7 @@ void updateSchema(Watcher watcher, int expectedZkVersion)
* the current schema from ZooKeeper.
*/
@Override
- public void onReconnect() {
+ public void trigger() {
Review Comment:
Eventually a lot of these things will go away with things like Persistent
Watchers
##########
solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/SolrZookeeperEvent.java:
##########
@@ -0,0 +1,62 @@
+/*
+ * 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.solr.common.cloud;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.curator.framework.CuratorFramework;
+import org.apache.curator.framework.state.ConnectionState;
+import org.apache.curator.framework.state.ConnectionStateListener;
+
+public enum SolrZookeeperEvent {
+ // Only triggered after resume from expiration
+ EXPIRED_RECONNECTION {
+ @Override
+ public ConnectionStateListener of(EventAction action) {
+ return new ConnectionStateListener() {
+ private final AtomicBoolean isExpired = new AtomicBoolean(false);
+
+ @Override
+ public void stateChanged(CuratorFramework client, ConnectionState
newState) {
+ if (newState == ConnectionState.LOST) {
+ isExpired.set(true);
+ } else if (newState == ConnectionState.RECONNECTED) {
+ if (isExpired.compareAndSet(true, false)) {
+ action.trigger();
+ }
+ }
Review Comment:
So I understand and agree with this logic. However, why can't this logic go
into the ZkController instead of the individual ConnectionStateListener? We
call the users onReconnect ourselves, the only time we give it to Curator
directly is in ZkStateReader. But we can make the fix there as well to keep the
isExpired state until we can move things to persistent watches.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
