diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-10-19 16:11:46 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-10-19 16:11:46 +0100 |
| commit | e00a2c087ef5aa7008e6fe70a1c9585c49b74b8f (patch) | |
| tree | caca436f120047a33682a84ac3a5545e1b8e30d3 /src | |
| parent | efbf8fca2ee1da46760e7e9689483df774065555 (diff) | |
| download | rabbitmq-server-git-e00a2c087ef5aa7008e6fe70a1c9585c49b74b8f.tar.gz | |
reversing previous change, as I had actually got it right first time
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_queue_index.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index de0839fb84..3471913f65 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -283,8 +283,7 @@ segment_size() -> ?SEGMENT_ENTRIES_COUNT. find_lowest_seq_id_seg_and_next_seq_id( - State = #qistate { dir = Dir, journal_ack_dict = JAckDict, - cur_seg_num = SegNum }) -> + State = #qistate { dir = Dir, journal_ack_dict = JAckDict }) -> SegNumsPaths = all_segment_nums_paths(Dir), %% We don't want the lowest seq_id, merely the seq_id of the start %% of the lowest segment. That seq_id may not actually exist, but @@ -300,7 +299,7 @@ find_lowest_seq_id_seg_and_next_seq_id( case SegNumsPaths of [] -> {0, State}; _ -> {SegNum2, SegPath2} = lists:max(SegNumsPaths), - State2 = close_file_handle_for_seg(SegNum, State), + State2 = close_file_handle_for_seg(SegNum2, State), {_SDict, _AckCount, HighRelSeq} = load_segment(SegNum2, SegPath2, JAckDict), {1 + reconstruct_seq_id(SegNum2, HighRelSeq), State2} |
