Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-14702: Fix ref-guide images to use leader-follower terms. (#149)

Houston Putman04327163f0d1
diff --git a/solr/solr-ref-guide/src/combining-distribution-and-replication.adoc b/solr/solr-ref-guide/src/combining-distribution-and-replication.adoc
index 0c5e3c3bd2f..a45e59fbf37 100644
--- a/solr/solr-ref-guide/src/combining-distribution-and-replication.adoc
+++ b/solr/solr-ref-guide/src/combining-distribution-and-replication.adoc
@@ -23,7 +23,7 @@ The idea is to combine distributed search with replication. As shown in the figu
Query requests should be load balanced across each of the shard followers. This gives you both increased query handling capacity and fail-over backup if a server goes down.
.A Solr configuration combining both replication and leader-follower distribution.
-image::images/combining-distribution-and-replication/worddav4101c16174820e932b44baa22abcfcd1.png[image,width=312,height=344]
+image::images/combining-distribution-and-replication/distributed-replication.png[image,width=312,height=344]
None of the leader shards in this configuration know about each other. You index to each leader, the index is replicated to each follower, and then searches are distributed across the followers, using one follower from each leader/follower shard.
diff --git a/solr/solr-ref-guide/src/images/combining-distribution-and-replication/distributed-replication.png b/solr/solr-ref-guide/src/images/combining-distribution-and-replication/distributed-replication.png
new file mode 100644
index 00000000000..49af2a67ae4
Binary files /dev/null and b/solr/solr-ref-guide/src/images/combining-distribution-and-replication/distributed-replication.png differ
diff --git a/solr/solr-ref-guide/src/images/combining-distribution-and-replication/worddav4101c16174820e932b44baa22abcfcd1.png b/solr/solr-ref-guide/src/images/combining-distribution-and-replication/worddav4101c16174820e932b44baa22abcfcd1.png
deleted file mode 100644
index f0e4d89f835..00000000000
Binary files a/solr/solr-ref-guide/src/images/combining-distribution-and-replication/worddav4101c16174820e932b44baa22abcfcd1.png and /dev/null differ
diff --git a/solr/solr-ref-guide/src/images/index-replication/leader-follower-replication.png b/solr/solr-ref-guide/src/images/index-replication/leader-follower-replication.png
new file mode 100644
index 00000000000..f38ada53275
Binary files /dev/null and b/solr/solr-ref-guide/src/images/index-replication/leader-follower-replication.png differ
diff --git a/solr/solr-ref-guide/src/images/index-replication/worddav2b7e14725d898b4104cdd9c502fc77cd.png b/solr/solr-ref-guide/src/images/index-replication/worddav2b7e14725d898b4104cdd9c502fc77cd.png
deleted file mode 100644
index e635aad8d20..00000000000
Binary files a/solr/solr-ref-guide/src/images/index-replication/worddav2b7e14725d898b4104cdd9c502fc77cd.png and /dev/null differ
diff --git a/solr/solr-ref-guide/src/index-replication.adoc b/solr/solr-ref-guide/src/index-replication.adoc
index 961cb249838..738767dac08 100644
--- a/solr/solr-ref-guide/src/index-replication.adoc
+++ b/solr/solr-ref-guide/src/index-replication.adoc
@@ -21,7 +21,7 @@ Index Replication distributes complete copies of a leader index to one or more f
The figure below shows a Solr configuration using index replication. The leader server's index is replicated on the followers.
.A Solr index can be replicated across multiple follower servers, which then process requests.
-image::images/index-replication/worddav2b7e14725d898b4104cdd9c502fc77cd.png[image,width=159,height=235]
+image::images/index-replication/leader-follower-replication.png[image,width=203,height=235]
== Index Replication in Solr