@@ -60,7 +60,8 @@ public class Storage {
6060 private FrontendNodeType role = FrontendNodeType .UNKNOWN ;
6161 private String nodeName ;
6262 private long editsSeq ;
63- private long imageSeq ;
63+ private long latestImageSeq ;
64+ private long latestValidatedImageSeq ;
6465 private String metaDir ;
6566 private List <Long > editsFileSequenceNumbers ;
6667
@@ -70,11 +71,11 @@ public Storage(int clusterID, String token, String metaDir) {
7071 this .metaDir = metaDir ;
7172 }
7273
73- public Storage (int clusterID , String token , long imageSeq , long editsSeq , String metaDir ) {
74+ public Storage (int clusterID , String token , long latestImageSeq , long editsSeq , String metaDir ) {
7475 this .clusterID = clusterID ;
7576 this .token = token ;
7677 this .editsSeq = editsSeq ;
77- this .imageSeq = imageSeq ;
78+ this .latestImageSeq = latestImageSeq ;
7879 this .metaDir = metaDir ;
7980 }
8081
@@ -114,31 +115,33 @@ public void reload() throws IOException {
114115 nodeName = prop .getProperty (NODE_NAME , null );
115116 }
116117
117- // Find the latest image
118+ // Find the latest two images
118119 File dir = new File (metaDir );
119120 File [] children = dir .listFiles ();
120121 if (children == null ) {
121122 return ;
122- } else {
123- for (File child : children ) {
124- String name = child .getName ();
125- try {
126- if (!name .equals (EDITS ) && !name .equals (IMAGE_NEW )
127- && !name .endsWith (".part" ) && name .contains ("." )) {
128- if (name .startsWith (IMAGE )) {
129- imageSeq = Math .max (Long .parseLong (name .substring (name .lastIndexOf ('.' ) + 1 )), imageSeq );
130- } else if (name .startsWith (EDITS )) {
131- // Just record the sequence part of the file name
132- editsFileSequenceNumbers .add (Long .parseLong (name .substring (name .lastIndexOf ('.' ) + 1 )));
133- editsSeq = Math .max (Long .parseLong (name .substring (name .lastIndexOf ('.' ) + 1 )), editsSeq );
123+ }
124+ for (File child : children ) {
125+ String name = child .getName ();
126+ try {
127+ if (!name .equals (EDITS ) && !name .equals (IMAGE_NEW )
128+ && !name .endsWith (".part" ) && name .contains ("." )) {
129+ if (name .startsWith (IMAGE )) {
130+ long fileSeq = Long .parseLong (name .substring (name .lastIndexOf ('.' ) + 1 ));
131+ if (latestImageSeq < fileSeq ) {
132+ latestValidatedImageSeq = latestImageSeq ;
133+ latestImageSeq = fileSeq ;
134134 }
135+ } else if (name .startsWith (EDITS )) {
136+ // Just record the sequence part of the file name
137+ editsFileSequenceNumbers .add (Long .parseLong (name .substring (name .lastIndexOf ('.' ) + 1 )));
138+ editsSeq = Math .max (Long .parseLong (name .substring (name .lastIndexOf ('.' ) + 1 )), editsSeq );
135139 }
136- } catch (Exception e ) {
137- LOG .warn (name + " is not a validate meta file, ignore it" );
138140 }
141+ } catch (Exception e ) {
142+ LOG .warn (name + " is not a validate meta file, ignore it" );
139143 }
140144 }
141-
142145 }
143146
144147 public int getClusterID () {
@@ -173,12 +176,16 @@ public void setMetaDir(String metaDir) {
173176 this .metaDir = metaDir ;
174177 }
175178
176- public long getImageSeq () {
177- return imageSeq ;
179+ public long getLatestImageSeq () {
180+ return latestImageSeq ;
181+ }
182+
183+ public long getLatestValidatedImageSeq () {
184+ return latestValidatedImageSeq ;
178185 }
179186
180- public void setImageSeq (long imageSeq ) {
181- this .imageSeq = imageSeq ;
187+ public void setLatestImageSeq (long latestImageSeq ) {
188+ this .latestImageSeq = latestImageSeq ;
182189 }
183190
184191 public void setEditsSeq (long editsSeq ) {
@@ -272,7 +279,7 @@ public static void rename(File from, File to) throws IOException {
272279 }
273280
274281 public File getCurrentImageFile () {
275- return getImageFile (imageSeq );
282+ return getImageFile (latestImageSeq );
276283 }
277284
278285 public File getImageFile (long version ) {
0 commit comments